[util-linux-ng/f14/master] 2.18-4.7: improve RAIDs detection

kzak kzak at fedoraproject.org
Wed Jan 12 13:35:27 UTC 2011


commit 610a3d4de5be5a184ad61c0c6a09220713d00d9e
Author: Karel Zak <kzak at redhat.com>
Date:   Wed Jan 12 14:35:04 2011 +0100

    2.18-4.7: improve RAIDs detection
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 util-linux-ng-2.18-blkid-raid.patch |   12 ++++++++++++
 util-linux-ng.spec                  |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/util-linux-ng-2.18-blkid-raid.patch b/util-linux-ng-2.18-blkid-raid.patch
new file mode 100644
index 0000000..e66b2a6
--- /dev/null
+++ b/util-linux-ng-2.18-blkid-raid.patch
@@ -0,0 +1,12 @@
+diff -up util-linux-ng-2.18/shlibs/blkid/src/partitions/partitions.c.kzak util-linux-ng-2.18/shlibs/blkid/src/partitions/partitions.c
+--- util-linux-ng-2.18/shlibs/blkid/src/partitions/partitions.c.kzak	2011-01-12 14:21:10.000000000 +0100
++++ util-linux-ng-2.18/shlibs/blkid/src/partitions/partitions.c	2011-01-12 14:20:54.000000000 +0100
+@@ -833,7 +833,7 @@ int blkid_probe_is_covered_by_pt(blkid_p
+ 	for (i = 0; i < nparts; i++) {
+ 		blkid_partition par = &ls->parts[i];
+ 
+-		if (par->start + par->size > pr->size) {
++		if (par->start + par->size > (pr->size >> 9)) {
+ 			DBG(DEBUG_LOWPROBE, printf("partition #%d overflows "
+ 					"device (off=%lu size=%lu)\n",
+ 					par->partno, par->start, par->size));
diff --git a/util-linux-ng.spec b/util-linux-ng.spec
index 16bf778..8da638f 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.18
-Release: 4.6%{?dist}
+Release: 4.7%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -132,7 +132,8 @@ Patch17: util-linux-ng-2.18-mount-context.patch
 Patch18: util-linux-ng-2.18-blkid-offset.patch
 # fix blkid cache usage
 Patch19: util-linux-ng-2.18-blkid-revalidate.patch
-
+# 543749 [+592958] - mdraid assembles incorrectly
+Patch20: util-linux-ng-2.18-blkid-raid.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -258,6 +259,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 unset LINGUAS || :
@@ -794,6 +796,9 @@ fi
 
 
 %changelog
+* Wed Jan 12 2011 Karel Zak <kzak at redhat.com> 2.18-4.7
+- improve raid member detection on patitioned raid devices (#543749)
+
 * Thu Nov 25 2010 Karel Zak <kzak at redhat.com> 2.18-4.6
 - backport upstream patch to fix wipefs(8) for LUKS
 - backport upstream patch to fix blkid cache usage


More information about the scm-commits mailing list