diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-10-06 15:43:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-10-06 15:43:19 -0700 |
| commit | fc5b94f1cb405c7129a337db6ae7db3b1e325c48 (patch) | |
| tree | c18215a81e475640b1e86e2ae98d5e18c9b38549 /drivers/block | |
| parent | Merge tag 'io_uring-6.6-2023-10-06' of git://git.kernel.dk/linux (diff) | |
| parent | nbd: don't call blk_mark_disk_dead nbd_clear_sock_ioctl (diff) | |
| download | linux-fc5b94f1cb405c7129a337db6ae7db3b1e325c48.tar.gz linux-fc5b94f1cb405c7129a337db6ae7db3b1e325c48.tar.bz2 linux-fc5b94f1cb405c7129a337db6ae7db3b1e325c48.zip | |
Merge tag 'block-6.6-2023-10-06' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Just two minor fixes, for nbd and md"
* tag 'block-6.6-2023-10-06' of git://git.kernel.dk/linux:
nbd: don't call blk_mark_disk_dead nbd_clear_sock_ioctl
md/raid5: release batch_last before waiting for another stripe_head
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nbd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index df1cd0f718b8..800f131222fc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1436,8 +1436,9 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd) static void nbd_clear_sock_ioctl(struct nbd_device *nbd) { - blk_mark_disk_dead(nbd->disk); nbd_clear_sock(nbd); + disk_force_media_change(nbd->disk); + nbd_bdev_reset(nbd); if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF, &nbd->config->runtime_flags)) nbd_config_put(nbd); |