diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-05-28 11:55:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-05-28 14:56:52 +0200 |
| commit | 6314a108ec19aefa5160535b2bfe1ca9c38efe37 (patch) | |
| tree | 1d5431f1eafa04a0eb13efb551b94fb5c037ee86 /drivers/block/floppy.c | |
| parent | 9b204fbf0987748ec6cc4a3cde0064ecf42accd0 (diff) | |
| download | op-kernel-dev-6314a108ec19aefa5160535b2bfe1ca9c38efe37.zip op-kernel-dev-6314a108ec19aefa5160535b2bfe1ca9c38efe37.tar.gz | |
floppy: do not corrupt bio.bi_flags when reading block 0
Commit 41a55b4de39 ("floppy: silence warning during disk test") caused
bio.bi_flags being overwritten, and its initialization to BIO_UPTODATE
in bio_init() to be lost.
This was unnoticed until 7b7b68bba5 ("floppy: bail out in open() if
drive is not responding to block0 read"), because the error value wasn't
checked for in the bio completion callback.
Now we are actually looking at the error, and the loss of BIO_UPTODATE
causes EIO to be wrongly passed to the callback, which confuses the
FD_OPEN_SHOULD_FAIL_BIT logic.
Fix this by not destroying previous value of bi_flags when setting
BIO_QUIET.
Cc: Stephen Hemminger <shemminger@vyatta.com>
Reported-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 5f69c91..8e767bb 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3809,7 +3809,7 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive) bio.bi_iter.bi_size = size; bio.bi_bdev = bdev; bio.bi_iter.bi_sector = 0; - bio.bi_flags = (1 << BIO_QUIET); + bio.bi_flags |= (1 << BIO_QUIET); bio.bi_private = &cbdata; bio.bi_end_io = floppy_rb0_cb; |
