Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'block-6.2-2023-02-17' of git://git.kernel.dk/linux

Pull block fix from Jens Axboe:
"I guess this is what can happen when you prep things early for going
away, something else comes in last minute. This one fixes another
regression in 6.2 for NVMe, from this release, and hence we should
probably get it submitted for 6.2.

Still waiting for the original reporter (see bugzilla linked in the
commit) to test this, but Keith managed to setup and recreate the
issue and tested the patch that way"

* tag 'block-6.2-2023-02-17' of git://git.kernel.dk/linux:
nvme-pci: refresh visible attrs for cmb attributes

+8
+8
drivers/nvme/host/pci.c
··· 110 110 111 111 static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown); 112 112 static void nvme_delete_io_queues(struct nvme_dev *dev); 113 + static void nvme_update_attrs(struct nvme_dev *dev); 113 114 114 115 /* 115 116 * Represents an NVM Express device. Each nvme_dev is a PCI function. ··· 1924 1923 if ((dev->cmbsz & (NVME_CMBSZ_WDS | NVME_CMBSZ_RDS)) == 1925 1924 (NVME_CMBSZ_WDS | NVME_CMBSZ_RDS)) 1926 1925 pci_p2pmem_publish(pdev, true); 1926 + 1927 + nvme_update_attrs(dev); 1927 1928 } 1928 1929 1929 1930 static int nvme_set_host_mem(struct nvme_dev *dev, u32 bits) ··· 2211 2208 &nvme_pci_dev_attrs_group, 2212 2209 NULL, 2213 2210 }; 2211 + 2212 + static void nvme_update_attrs(struct nvme_dev *dev) 2213 + { 2214 + sysfs_update_group(&dev->ctrl.device->kobj, &nvme_pci_dev_attrs_group); 2215 + } 2214 2216 2215 2217 /* 2216 2218 * nirqs is the number of interrupts available for write and read