Commit 3c8cef9f authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.17-2022-01-27' of git://git.infradead.org/nvme into block-5.17 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.17

 - add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs (Wu Zheng)
 - remove the unneeded ret variable in nvmf_dev_show (Changcheng Deng)"

* tag 'nvme-5.17-2022-01-27' of git://git.infradead.org/nvme:
  nvme-fabrics: remove the unneeded ret variable in nvmf_dev_show
  nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs
parents 592ee119 a5f3851b

drivers/nvme/host/fabrics.c

+1 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,6 @@ static void __nvmf_concat_opt_tokens(struct seq_file *seq_file) 
static int nvmf_dev_show(struct seq_file *seq_file, void *private)

{

	struct nvme_ctrl *ctrl;

	int ret = 0;



	mutex_lock(&nvmf_dev_mutex);

	ctrl = seq_file->private;
@@ -1106,7 +1105,7 @@ static int nvmf_dev_show(struct seq_file *seq_file, void *private) 


out_unlock:

	mutex_unlock(&nvmf_dev_mutex);

	return ret;

	return 0;

}



static int nvmf_dev_open(struct inode *inode, struct file *file)

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -3391,7 +3391,8 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_DEALLOCATE_ZEROES, },

	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */

		.driver_data = NVME_QUIRK_STRIPE_SIZE |

				NVME_QUIRK_DEALLOCATE_ZEROES, },

				NVME_QUIRK_DEALLOCATE_ZEROES |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */

		.driver_data = NVME_QUIRK_STRIPE_SIZE |

				NVME_QUIRK_DEALLOCATE_ZEROES, },