Commit 6314a108 authored May 28, 2014 by Jiri Kosina

floppy: do not corrupt bio.bi_flags when reading block 0



Commit 41a55b4d ("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 7b7b68bb ("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>

parent 9b204fbf

drivers/block/floppy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message