Remove old ifdef, all recent systems have this defined.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@513 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index 78e897b..7137ec2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-04-18  Milan Broz  <mbroz@redhat.com>
+       * Fix error paths in blockwise code and lseek_write call.
+
 2011-04-05  Milan Broz  <mbroz@redhat.com>
        * Version 1.3.0.
 

diff --git a/lib/utils.c b/lib/utils.c
index af17f8f..6339c9c 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -351,35 +351,25 @@ int get_device_infos(const char *device,
        if (fd == -1)
                return -EINVAL;
 
-#ifdef BLKROGET
        /* If the device can be opened read-write, i.e. readonly is still 0, then
         * check whether BKROGET says that it is read-only. E.g. read-only loop
         * devices may be openend read-write but are read-only according to BLKROGET
         */
        if (*readonly == 0 && (r = ioctl(fd, BLKROGET, readonly)) < 0)
                goto out;
-#else
-#error BLKROGET not available
-#endif
 
-#ifdef BLKGETSIZE64
        if (ioctl(fd, BLKGETSIZE64, size) >= 0) {
                *size >>= SECTOR_SHIFT;
                r = 0;
                goto out;
        }
-#endif
 
-#ifdef BLKGETSIZE
        if (ioctl(fd, BLKGETSIZE, &size_small) >= 0) {
                *size = (uint64_t)size_small;
                r = 0;
                goto out;
        }
 
-#else
-#      error Need at least the BLKGETSIZE ioctl!
-#endif
        r = -EINVAL;
 out:
        close(fd);