openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "lightnvm: prevent bd removal if busy" 

Christoph correctly points out that this issue is no different
for other block devices, and poking at cross layer internals
is not the right way to solve it.

This reverts commit bb6aa6f082.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2017-10-13 09:36:06 -06:00
parent 1a94b2d484
commit cdd094fd0a
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/lightnvm/core.c
View File

@ -390,7 +390,6 @@ static void __nvm_remove_target(struct nvm_target *t)
static int nvm_remove_tgt(struct nvm_dev *dev, struct nvm_ioctl_remove *remove)
{
struct nvm_target *t;
struct block_device *bdev;
mutex_lock(&dev->mlock);
t = nvm_find_target(dev, remove->tgtname);
@ -398,19 +397,6 @@ static int nvm_remove_tgt(struct nvm_dev *dev, struct nvm_ioctl_remove *remove)
mutex_unlock(&dev->mlock);
return 1;
}
bdev = bdget_disk(t->disk, 0);
if (!bdev) {
pr_err("nvm: removal failed, allocating bd failed\n");
mutex_unlock(&dev->mlock);
return -ENOMEM;
}
if (bdev->bd_super || bdev->bd_part_count) {
pr_err("nvm: removal failed, block device busy\n");
bdput(bdev);
mutex_unlock(&dev->mlock);
return -EBUSY;
}
bdput(bdev);
__nvm_remove_target(t);
mutex_unlock(&dev->mlock);