From 8d17be338f6bda1d056de05818989610ef232c9e Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 13 Oct 2017 09:36:06 -0600 Subject: [PATCH] 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 212ccb471c81779f2029f06d88eb2dfd06ae46cb. Signed-off-by: Jens Axboe --- drivers/lightnvm/core.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index fe21f4dd33e91..83249b43dd069 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -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); -- 2.39.5