| Message ID | 20201207131918.2252553-7-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] dm: use bdev_read_only to check if a device is read-only | expand |
On Mon, Dec 07, 2020 at 02:19:18PM +0100, Christoph Hellwig wrote: > 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> Looks good. Reviewed-by: Keith Busch <kbusch@kernel.org>
Christoph, > 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. Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 24d7f64f14cb15..18cbf92fc4f957 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2114,9 +2114,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)
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> --- drivers/nvme/host/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)