From: Karel Zak <kzak@redhat.com>
Date: Mon, 27 Jun 2011 13:57:14 +0000 (+0200)
Subject: lib: [blkdev.c] more robust blkdev_is_misaligned()
X-Git-Tag: v2.20-rc1~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6678c06f5d15814a982397977c7e9f14c219137f;p=thirdparty%2Futil-linux.git

lib: [blkdev.c] more robust blkdev_is_misaligned()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/blkdev.c b/lib/blkdev.c
index b6f9bfd328..d889b787f1 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -240,7 +240,11 @@ int blkdev_is_misaligned(int fd)
 
 	if (ioctl(fd, BLKALIGNOFF, &aligned) < 0)
 		return 0;			/* probably kernel < 2.6.32 */
-	return aligned;
+	/*
+	 * Note that kernel returns -1 as alignement offset if no compatible
+	 * sizes and alignments exist for stacked devices
+	 */
+	return aligned != 0 ? 1 : 0;
 #else
 	return 0;
 #endif