On Tue, Dec 08, 2020 at 05:28:29PM +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@xxxxxx> > Reviewed-by: Keith Busch <kbusch@xxxxxxxxxx> > Reviewed-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> > --- > drivers/nvme/host/core.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index ce1b6151944131..3a0557ccc9fc5d 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) > -- > 2.29.2 > Reviewed-by: Ming Lei <ming.lei@xxxxxxxxxx> -- Ming
