From: Ming Lin Date: Wed, 10 Feb 2016 18:03:31 +0000 (-0800) Subject: nvme: split dev_list_lock X-Git-Tag: v4.1.12-102.0.20170601_1400~130 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=288384884ee21b05cf506756ecd582e329d2038e;p=users%2Fjedix%2Flinux-maple.git nvme: split dev_list_lock Split dev_list_lock into one in the core and one in the PCI driver. Reviewed-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn Reviewed-by: Sagi Grimberg Signed-off-by: Ming Lin Signed-off-by: Jens Axboe (cherry picked from commit 9f2482b91bcd02ac2999cf04b3fb1b89e1c4d559) Orabug: 25130845 Signed-off-by: Ashok Vairavan Reviewed-by: Martin K. Petersen --- diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6813c143a82b..614739ec5644 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -52,7 +52,7 @@ static int nvme_char_major; module_param(nvme_char_major, int, 0); static LIST_HEAD(nvme_ctrl_list); -DEFINE_SPINLOCK(dev_list_lock); +static DEFINE_SPINLOCK(dev_list_lock); static struct class *nvme_class; diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index e54bedf1c089..8b8ef9bdf4d6 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -259,8 +259,6 @@ int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11, dma_addr_t dma_addr, u32 *result); int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count); -extern spinlock_t dev_list_lock; - struct sg_io_hdr; int nvme_sg_io(struct nvme_ns *ns, struct sg_io_hdr __user *u_hdr); diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index ad3a752bcd60..135059ed5db9 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -72,6 +72,7 @@ module_param(nvme_io_queues, uint, 0); MODULE_PARM_DESC(nvme_io_queues, "set the number of nvme io queues"); static LIST_HEAD(dev_list); +static DEFINE_SPINLOCK(dev_list_lock); static struct task_struct *nvme_thread; static struct workqueue_struct *nvme_workq; static wait_queue_head_t nvme_kthread_wait;