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@xxxxxx> --- drivers/nvme/host/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index bc89e8659c403f..2442f43a1a5624 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2047,8 +2047,7 @@ 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) - set_disk_ro(disk, true); + set_disk_ro(disk, id->nsattr & NVME_NS_ATTR_RO); } static inline bool nvme_first_scan(struct gendisk *disk) -- 2.29.2