Skip to content

Commit abbbdf1

Browse files
ratnamanojbollaaxboe
authored andcommitted
nbd: replace kill_bdev() with __invalidate_device()
When a filesystem is mounted on a nbd device and on a disconnect, because of kill_bdev(), and resetting bdev size to zero, buffer_head mappings are getting destroyed under mounted filesystem. After a bdev size reset(i.e bdev->bd_inode->i_size = 0) on a disconnect, followed by a sys_umount(), generic_shutdown_super()->... ->__sync_blockdev()->... -blkdev_writepages()->... ->do_invalidatepage()->... -discard_buffer() is discarding superblock buffer_head assumed to be in mapped state by ext4_commit_super(). [mlin: ported to 4.11-rc2] Signed-off-by: Ratna Manoj Bolla <[email protected] Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent f858685 commit abbbdf1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/block/nbd.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ static const char *nbdcmd_to_ascii(int cmd)
126126

127127
static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev)
128128
{
129-
bd_set_size(bdev, 0);
129+
if (bdev->bd_openers <= 1)
130+
bd_set_size(bdev, 0);
130131
set_capacity(nbd->disk, 0);
131132
kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
132133

@@ -665,6 +666,8 @@ static void nbd_reset(struct nbd_device *nbd)
665666

666667
static void nbd_bdev_reset(struct block_device *bdev)
667668
{
669+
if (bdev->bd_openers > 1)
670+
return;
668671
set_device_ro(bdev, false);
669672
bdev->bd_inode->i_size = 0;
670673
if (max_part > 0) {
@@ -728,7 +731,8 @@ static int nbd_clear_sock(struct nbd_device *nbd, struct block_device *bdev)
728731
{
729732
sock_shutdown(nbd);
730733
nbd_clear_que(nbd);
731-
kill_bdev(bdev);
734+
735+
__invalidate_device(bdev, true);
732736
nbd_bdev_reset(bdev);
733737
/*
734738
* We want to give the run thread a chance to wait for everybody

0 commit comments

Comments
 (0)