> - if (id->nsattr & NVME_NS_ATTR_RO) > + if (id->nsattr & NVME_NS_ATTR_RO || > + test_bit(NVME_NS_FORCE_RO, &ns->flags)) > set_disk_ro(disk, true); > else > set_disk_ro(disk, false); This has a very minor conflict with the patch from Sagi to remove the else side of the clause. I'll merge your patch and will fix unless someone else objects to the approach. Note that as discussed we really need a hard read-only settings instead of set_disk_ro for both NVME_NS_ATTR_RO and the zns with missing features case, but I'll look into that once I've got a few other things off my plate.
