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

axboe · axboe · commit b5214c605fc1 · 2020-11-10T07:51:39.000-07:00
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
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -2060,8 +2060,6 @@ static void nvme_update_disk_info(struct gendisk *disk,`
`2060`	`2060`
`2061`	`2061`	`if (id->nsattr & NVME_NS_ATTR_RO)`
`2062`	`2062`	`set_disk_ro(disk, true);`
`2063`		`- else`
`2064`		`- set_disk_ro(disk, false);`
`2065`	`2063`	`}`
`2066`	`2064`
`2067`	`2065`	`static inline bool nvme_first_scan(struct gendisk *disk)`