PCI: kill BKL in /proc/pci (991f7395) · Commits · 戴 / test

All operations in the pci procfs ioctl functions are atomic, so no lock is needed here. Also add a compat_ioctl method, since all the commands are compatible in 32 bit mode. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: Tejun Heo <tj@kernel.org> Cc: linux-pci@vger.kernel.org Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/proc.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -212,8 +212,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
		#endif /* HAVE_PCI_MMAP */
		int ret = 0;

		lock_kernel();

		switch (cmd) {
		case PCIIOC_CONTROLLER:
		ret = pci_domain_nr(dev->bus);
		@@ -242,7 +240,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
		break;
		};

		unlock_kernel();
		return ret;
		}

		@@ -306,6 +303,7 @@ static const struct file_operations proc_bus_pci_operations = {
		.read = proc_bus_pci_read,
		.write = proc_bus_pci_write,
		.unlocked_ioctl = proc_bus_pci_ioctl,
		.compat_ioctl = proc_bus_pci_ioctl,
		#ifdef HAVE_PCI_MMAP
		.open = proc_bus_pci_open,
		.release = proc_bus_pci_release,

Admin message