From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 29 Jun 2017 02:09:07 +0000 (+0200)
Subject: lib/blkdev: remove support for Linux < 2.6
X-Git-Tag: v2.31-rc1~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad553030fbaa2654e3ec8e9524b096eae6b57b21;p=thirdparty%2Futil-linux.git

lib/blkdev: remove support for Linux < 2.6

Remove a hack for kernels between  2.4.15 and 2.4.17

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/lib/blkdev.c b/lib/blkdev.c
index 2b62f09d8b..0616142b88 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -91,18 +91,9 @@ blkdev_get_size(int fd, unsigned long long *bytes)
 #endif
 
 #ifdef BLKGETSIZE64
-	{
-#ifdef __linux__
-		int ver = get_linux_version();
-
-		/* kernels 2.4.15-2.4.17, had a broken BLKGETSIZE64 */
-		if (ver >= KERNEL_VERSION (2,6,0) ||
-		   (ver >= KERNEL_VERSION (2,4,18) && ver < KERNEL_VERSION (2,5,0)))
+	if (ioctl(fd, BLKGETSIZE64, bytes) >= 0)
+		return 0;
 #endif
-			if (ioctl(fd, BLKGETSIZE64, bytes) >= 0)
-				return 0;
-	}
-#endif /* BLKGETSIZE64 */
 
 #ifdef BLKGETSIZE
 	{