diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-11-10 07:51:39 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-10 07:51:39 -0700 |
| commit | b5214c605fc10c356c4bbb0c7fedef40a85e685c (patch) | |
| tree | feb2d7ce2260930cb8d297ec2e80bffbddd20024 | |
| parent | null_blk: Fix scheduling in atomic with zoned mode (diff) | |
| parent | nvme: fix incorrect behavior when BLKROSET is called by the user (diff) | |
| download | linux-dev-b5214c605fc10c356c4bbb0c7fedef40a85e685c.tar.xz linux-dev-b5214c605fc10c356c4bbb0c7fedef40a85e685c.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 40ca71b29bb9..9b01afcb7777 100644 --- 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) |