Merge tag 'nvme-5.10-2020-11-10' of git://git.infradead.org/nvme into block-5.10

Pull NVMe fix from Christoph:

"nvme fixes for 5.10:

 - don't clear the read-only bit on a revalidate (Sagi Grimberg)"

* tag 'nvme-5.10-2020-11-10' of git://git.infradead.org/nvme:
  nvme: fix incorrect behavior when BLKROSET is called by the user
This commit is contained in:
Jens Axboe
2020-11-10 07:51:39 -07:00

View File

@@ -2060,8 +2060,6 @@ static void nvme_update_disk_info(struct gendisk *disk,
if (id->nsattr & NVME_NS_ATTR_RO)
set_disk_ro(disk, true);
else
set_disk_ro(disk, false);
}
static inline bool nvme_first_scan(struct gendisk *disk)