nbd: don't call blk_mark_disk_dead nbd_clear_sock_ioctl
authorChristoph Hellwig <hch@lst.de>
Tue, 3 Oct 2023 15:31:06 +0000 (17:31 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 4 Oct 2023 00:27:44 +0000 (18:27 -0600)
commit07a1141ff170ff5d4f9c4fbb0453727ab48096e5
tree53589a5bc299b8913029579b1ff98054f47a57cf
parente680a14aec194dfd48e0235dcea656fb32fae75f
nbd: don't call blk_mark_disk_dead nbd_clear_sock_ioctl

blk_mark_disk_dead is the proper interface to shut down a block
device, but it also makes the disk unusable forever.

nbd_clear_sock_ioctl on the other hand wants to shut down the file
system, but allow the block device to be used again when when connected
to another socket.  Switch nbd to use disk_force_media_change and
nbd_bdev_reset to go back to a behavior of the old __invalidate_device
call, with the added benefit of incrementing the device generation
as there is no guarantee the old content comes back when the device
is reconnected.

Reported-by: Samuel Holland <samuel.holland@sifive.com>
Reported-by: Shinichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Fixes: 0c1c9a27ce90 ("nbd: call blk_mark_disk_dead in nbd_clear_sock_ioctl")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Samuel Holland <samuel.holland@sifive.com>
Link: https://lore.kernel.org/r/20231003153106.1331363-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/nbd.c