diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-01-09 11:42:54 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-01-24 18:15:57 -0700 |
| commit | d11cd28998e9d25389d8c20e7cce0e4b4f17bee1 (patch) | |
| tree | cefec5c99d3e3d0b3fce3227d6c7a2a66321c33a /drivers/nvme | |
| parent | cbf72cce6370b3ec1a6073cf777ab9b6ba5bf5b9 (diff) | |
| download | linux-stable-d11cd28998e9d25389d8c20e7cce0e4b4f17bee1.tar.gz linux-stable-d11cd28998e9d25389d8c20e7cce0e4b4f17bee1.tar.bz2 linux-stable-d11cd28998e9d25389d8c20e7cce0e4b4f17bee1.zip | |
nvme: allow revalidate to set a namespace read-only
Unconditionally call set_disk_ro now that it only updates the hardware
state. This allows to properly set up the Linux devices read-only when
the controller turns a previously writable namespace read-only.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8caf9b34734d..566788ba4e7d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2125,9 +2125,8 @@ static void nvme_update_disk_info(struct gendisk *disk, nvme_config_discard(disk, ns); nvme_config_write_zeroes(disk, ns); - if ((id->nsattr & NVME_NS_ATTR_RO) || - test_bit(NVME_NS_FORCE_RO, &ns->flags)) - set_disk_ro(disk, true); + set_disk_ro(disk, (id->nsattr & NVME_NS_ATTR_RO) || + test_bit(NVME_NS_FORCE_RO, &ns->flags)); } static inline bool nvme_first_scan(struct gendisk *disk) |