eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-14 04:10:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove old ifdef, all recent systems have this defined.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@513 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-04-18 10:52:28 +00:00
parent 91372cb69c
commit 1b58fab430
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -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> 2011-04-05 Milan Broz <mbroz@redhat.com>
* Version 1.3.0. * Version 1.3.0.

10
lib/utils.c
View File

@@ -351,35 +351,25 @@ int get_device_infos(const char *device,
if (fd == -1) if (fd == -1)
return -EINVAL; return -EINVAL;
#ifdef BLKROGET
/* If the device can be opened read-write, i.e. readonly is still 0, then /* 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 * 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 * devices may be openend read-write but are read-only according to BLKROGET
*/ */
if (*readonly == 0 && (r = ioctl(fd, BLKROGET, readonly)) < 0) if (*readonly == 0 && (r = ioctl(fd, BLKROGET, readonly)) < 0)
goto out; goto out;
#else
#error BLKROGET not available
#endif
#ifdef BLKGETSIZE64
if (ioctl(fd, BLKGETSIZE64, size) >= 0) { if (ioctl(fd, BLKGETSIZE64, size) >= 0) {
*size >>= SECTOR_SHIFT; *size >>= SECTOR_SHIFT;
r = 0; r = 0;
goto out; goto out;
} }
#endif
#ifdef BLKGETSIZE
if (ioctl(fd, BLKGETSIZE, &size_small) >= 0) { if (ioctl(fd, BLKGETSIZE, &size_small) >= 0) {
*size = (uint64_t)size_small; *size = (uint64_t)size_small;
r = 0; r = 0;
goto out; goto out;
} }
#else
# error Need at least the BLKGETSIZE ioctl!
#endif
r = -EINVAL; r = -EINVAL;
out: out:
close(fd); close(fd);