Commit b5214c60 authored by Jens Axboe's avatar Jens Axboe
Browse files

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
parents e1777d09 65c5a055
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -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)