nvme: fix incorrect behavior when BLKROSET is called by the user

mainline inclusion
from mainline-5.10
commit 65c5a055
category: bugfix
bugzilla: NA
CVE: NA

-------------------------------------------------

The offending commit breaks BLKROSET ioctl because a device
revalidation will blindly override BLKROSET setting. Hence,
we remove the disk rw setting in case NVME_NS_ATTR_RO is cleared
from by the controller.

Fixes: 1293477f ("nvme: set gendisk read only based on nsattr")
Signed-off-by: NSagi Grimberg <sagi@grimberg.me>
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NWenchao Hao <haowenchao@huawei.com>
Reviewed-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

drivers/nvme/host/core.c

@@ -1682,8 +1682,6 @@ static void nvme_update_disk_info(struct gendisk *disk,
 
 	if (id->nsattr & (1 << 0))
 		set_disk_ro(disk, true);
-	else
-		set_disk_ro(disk, false);
 
 	blk_mq_unfreeze_queue(disk->queue);
 }