diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-11-18 15:46:03 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-18 15:46:03 -0700 |
| commit | a78b03bc7300e4f17b1e510884bea1095d92b17b (patch) | |
| tree | 855f219806462da09c8021b27848c58713bb1807 /drivers/block | |
| parent | fce15a609f8f30cfacfaf684729add9582be780b (diff) | |
| parent | 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6 (diff) | |
| download | linux-a78b03bc7300e4f17b1e510884bea1095d92b17b.tar.bz2 | |
Merge tag 'v4.20-rc3' into for-4.21/block
Merge in -rc3 to resolve a few conflicts, but also to get a few
important fixes that have gone into mainline since the block
4.21 branch was forked off (most notably the SCSI queue issue,
which is both a conflict AND needed fix).
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 3 | ||||
| -rw-r--r-- | drivers/block/xen-blkfront.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index cad339ec9c19..6f2856c6d0f2 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4142,10 +4142,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); diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 56452cabce5b..0ed4b200fa58 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1919,6 +1919,7 @@ static int negotiate_mq(struct blkfront_info *info) GFP_KERNEL); if (!info->rinfo) { xenbus_dev_fatal(info->xbdev, -ENOMEM, "allocating ring_info structure"); + info->nr_rings = 0; return -ENOMEM; } |