diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-01-09 20:08:13 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-01-17 05:12:06 -0500 |
commit | 7b7b68bba5ef23734c35ffb0d8d82079ed604d33 (patch) | |
tree | d6ce0b6d4b7b4cecf42efa3a227b0d6ed29e12b7 /include/uapi | |
parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) |
floppy: bail out in open() if drive is not responding to block0 read
In case reading of block 0 during open() fails, it is not the right thing
to let open() succeed.
Fix this by introducing FD_OPEN_SHOULD_FAIL_BIT flag, and setting it in
case the bio callback encounters an error while trying to read block 0.
As a bonus, this works around certain broken userspace (blkid), which is
not able to properly handle read()s returning IO errors. Hence be nice to
those, and bail out during open() already; if block 0 is not readable,
read()s are not going to provide any meaningful data anyway.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/fd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/fd.h b/include/uapi/linux/fd.h index f1f3dd5981b2..84c517cbce90 100644 --- a/include/uapi/linux/fd.h +++ b/include/uapi/linux/fd.h | |||
@@ -185,7 +185,8 @@ enum { | |||
185 | * to clear media change status */ | 185 | * to clear media change status */ |
186 | FD_UNUSED_BIT, | 186 | FD_UNUSED_BIT, |
187 | FD_DISK_CHANGED_BIT, /* disk has been changed since last i/o */ | 187 | FD_DISK_CHANGED_BIT, /* disk has been changed since last i/o */ |
188 | FD_DISK_WRITABLE_BIT /* disk is writable */ | 188 | FD_DISK_WRITABLE_BIT, /* disk is writable */ |
189 | FD_OPEN_SHOULD_FAIL_BIT | ||
189 | }; | 190 | }; |
190 | 191 | ||
191 | #define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) | 192 | #define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) |