From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on finch.gentoo.org X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=DATE_IN_PAST_06_12,DMARC_NONE, INVALID_DATE,MAILING_LIST_MULTI autolearn=no autolearn_force=no version=4.0.0 Received: from smtp07.iafrica.com ([196.2.51.6]) by cvs.gentoo.org with esmtp (Exim 3.30 #1) id 15nf5Y-0000Vv-00 for gentoo-dev@gentoo.org; Sun, 30 Sep 2001 05:48:53 -0600 Received: from nosferatu.lan ([196.30.178.111]) by smtp07.iafrica.com (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10) with ESMTP id <0GKH007IQ4VTWE@smtp07.iafrica.com> for gentoo-dev@gentoo.org; Sun, 30 Sep 2001 13:50:19 +0200 (SAT) From: Martin Schlemmer To: Gentoo-Dev Message-id: <1001850557.25564.18.camel@nosferatu.lan> MIME-version: 1.0 X-Mailer: Evolution/0.14 (Preview Release) Content-type: multipart/mixed; boundary="=-8ikW9azbsd2JqvmyBZ0B" Subject: [gentoo-dev] 2.4.10 LVM problems Sender: gentoo-dev-admin@cvs.gentoo.org Errors-To: gentoo-dev-admin@cvs.gentoo.org X-BeenThere: gentoo-dev@cvs.gentoo.org X-Mailman-Version: 2.0 Precedence: bulk Reply-To: gentoo-dev@cvs.gentoo.org List-Help: List-Post: List-Subscribe: , List-Id: Gentoo Linux development list List-Unsubscribe: , List-Archive: Date: Sun Sep 30 05:49:01 2001 X-Original-Date: Sun, 30 Sep 2001 13:49:16 +0200 X-Archives-Salt: e153ef8b-8f86-40c0-8a09-6f92dabf8f7b X-Archives-Hash: 133708d0f84e174bec49ca78f781b74a --=-8ikW9azbsd2JqvmyBZ0B Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi Dont use LVM, but from reports it seems that the LVM patch fails due to min()/max() being changed .. again. Included is a patch that should be applied to lvm-1.0.1-rc2-2.4.10.patch.bz2, and 'should' fix this problem. Greetings, MS -- Martin Schlemmer Gentoo Linux Developer, Desktop Team Developer Cape Town, South Africa --=-8ikW9azbsd2JqvmyBZ0B Content-Type: text/plain Content-Disposition: attachment; filename=lvm-1.0.1-rc2-2.4.10.patch.diff Content-ID: <1001850534.25530.17.camel@nosferatu.lan> Content-Transfer-Encoding: 7bit --- lvm-1.0.1-rc2-2.4.10.patch.orig Sun Sep 30 13:04:27 2001 +++ lvm-1.0.1-rc2-2.4.10.patch Sun Sep 30 13:06:59 2001 @@ -3043,7 +3043,7 @@ - lv_ptr->lv_current_pe[le].reads += pep1[le].reads; - lv_ptr->lv_current_pe[le].writes += pep1[le].writes; + if (old_lv->lv_stripes < 2) { /* linear logical volume */ -+ end = min(uint, old_lv->lv_current_le, new_lv->lv_current_le); ++ end = min(old_lv->lv_current_le, new_lv->lv_current_le); + for (l = 0; l < end; l++) { + new_lv->lv_current_pe[l].reads += + old_lv->lv_current_pe[l].reads; @@ -3065,7 +3065,7 @@ - i < lv_ptr->lv_stripes; i++) { + old_stripe_size = old_lv->lv_allocated_le / old_lv->lv_stripes; + new_stripe_size = new_lv->lv_allocated_le / new_lv->lv_stripes; -+ end = min(uint, old_stripe_size, new_stripe_size); ++ end = min(old_stripe_size, new_stripe_size); + + for (i = source = dest = 0; i < new_lv->lv_stripes; i++) { for (j = 0; j < end; j++) { @@ -4146,8 +4146,8 @@ blksize_snap = lvm_get_blksize(snap_phys_dev); - max_blksize = max(blksize_org, blksize_snap); - min_blksize = min(blksize_org, blksize_snap); -+ max_blksize = max(int, blksize_org, blksize_snap); -+ min_blksize = min(int, blksize_org, blksize_snap); ++ max_blksize = max(blksize_org, blksize_snap); ++ min_blksize = min(blksize_org, blksize_snap); max_sectors = KIO_MAX_SECTORS * (min_blksize>>9); if (chunk_size % (max_blksize>>9)) @@ -4156,7 +4156,7 @@ while (chunk_size) { - nr_sectors = min(chunk_size, max_sectors); -+ nr_sectors = min(int, chunk_size, max_sectors); ++ nr_sectors = min(chunk_size, max_sectors); chunk_size -= nr_sectors; iobuf->length = nr_sectors << 9; @@ -4262,7 +4262,7 @@ buckets = lv->lv_remap_end; max_buckets = calc_max_buckets(); - buckets = min(buckets, max_buckets); -+ buckets = min(unsigned long, buckets, max_buckets); ++ buckets = min(buckets, max_buckets); while (buckets & (buckets-1)) buckets &= (buckets-1); --=-8ikW9azbsd2JqvmyBZ0B--