diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2020-11-09 02:57:34 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-11-09 17:39:15 +0100 |
| commit | 65c5a055b0d567b7e7639d942c0605da9cc54c5e (patch) | |
| tree | feb2d7ce2260930cb8d297ec2e80bffbddd20024 /drivers/nvme | |
| parent | e1777d099728a76a8f8090f89649aac961e7e530 (diff) | |
nvme: fix incorrect behavior when BLKROSET is called by the user
The offending commit breaks BLKROSET ioctl because a device
revalidation will blindly override BLKROSET setting. Hence,
we remove the disk rw setting in case NVME_NS_ATTR_RO is cleared
from by the controller.
Fixes: 1293477f4f32 ("nvme: set gendisk read only based on nsattr")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 40ca71b29bb9..9b01afcb7777 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2060,8 +2060,6 @@ static void nvme_update_disk_info(struct gendisk *disk, if (id->nsattr & NVME_NS_ATTR_RO) set_disk_ro(disk, true); - else - set_disk_ro(disk, false); } static inline bool nvme_first_scan(struct gendisk *disk) |