diff options
| author | Keith Busch <kbusch@kernel.org> | 2023-06-15 18:17:57 +0300 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2023-06-16 18:15:57 +0300 |
| commit | 1c606f7f056b266a84482d5522d35bbbbed062db (patch) | |
| tree | 84bc4070b8effb9a836881db3d2caae85216b62b /drivers/nvme | |
| parent | c917dd96fe41c2fb2a4b606372bf64ec5661f509 (diff) | |
| download | linux-1c606f7f056b266a84482d5522d35bbbbed062db.tar.xz | |
nvme: forward port sysfs delete fix
We had a late fix that modified nvme_sysfs_delete() after the staging
branch for the next merge window relocated the function to a new file.
Port commit 2eb94dd56a4a4 ("nvme: do not let the user delete a ctrl
before a complete") to the latest to avoid a potentially confusing merge
conflict.
Cc: Maurizio Lombardi <mlombard@redhat.com>
Cc: Max Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/sysfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 796e1d373b7c..45e91811f905 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -202,6 +202,9 @@ static ssize_t nvme_sysfs_delete(struct device *dev, { struct nvme_ctrl *ctrl = dev_get_drvdata(dev); + if (!test_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags)) + return -EBUSY; + if (device_remove_file_self(dev, attr)) nvme_delete_ctrl_sync(ctrl); return count; |