From ad553030fbaa2654e3ec8e9524b096eae6b57b21 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Thu, 29 Jun 2017 04:09:07 +0200 Subject: 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 --- lib/blkdev.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'lib/blkdev.c') diff --git a/lib/blkdev.c b/lib/blkdev.c index 2b62f09d8..0616142b8 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 { -- cgit v1.2.3-55-g7522