diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-16 09:31:59 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-16 09:31:59 -0600 |
| commit | 59749c2d49bf28df69ac4bcabf1f69b00d3dca59 (patch) | |
| tree | b255e9caf4e731edfb671368d38b72d7e0d9af84 /drivers/block | |
| parent | 9b5f361ac4a923bf53ca8c0875509ef68c8958cd (diff) | |
| parent | 8dc765d438f1e42b3e8227b3b09fad7d73f4ec9a (diff) | |
| download | linux-59749c2d49bf28df69ac4bcabf1f69b00d3dca59.tar.bz2 | |
Merge tag 'for-linus-20181115' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Discard loop fix, caused by integer overflow (Dave)
- Blacklist of Samsung drive that hangs with power management (Diego)
- Copy bio priority when cloning it (Hannes)
- Fix race condition exposed in floppy (me)
- Fix SCSI queue cleanup regression. While elusive, it caused oopses in
queue running (Ming)
- Fix bad string copy in kyber tracing (Omar)
* tag 'for-linus-20181115' of git://git.kernel.dk/linux-block:
SCSI: fix queue cleanup race before queue initialization is done
block: fix 32 bit overflow in __blkdev_issue_discard()
libata: blacklist SAMSUNG MZ7TD256HAFV-000L9 SSD
block: copy ioprio in __bio_clone_fast() and bounce
kyber: fix wrong strlcpy() size in trace_kyber_latency()
floppy: fix race condition in __floppy_read_block_0()
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index a8cfa011c284..fb23578e9a41 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4148,10 +4148,11 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive) bio.bi_end_io = floppy_rb0_cb; bio_set_op_attrs(&bio, REQ_OP_READ, 0); + init_completion(&cbdata.complete); + submit_bio(&bio); process_fd_request(); - init_completion(&cbdata.complete); wait_for_completion(&cbdata.complete); __free_page(page); |