Commit d11cd289 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cbf72cce

drivers/nvme/host/core.c

+2 −3
Original line number Diff line number Diff line
@@ -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)