Skip to content

Commit

Permalink
NVMe: Change get_nvmeq to take a dev instead of a namespace
Browse files Browse the repository at this point in the history
Upcoming patches require calling get_nvmeq when we don't have a namespace.
Some callers already have the device in a local variable anyway.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
  • Loading branch information
Matthew Wilcox committed Jan 10, 2012
1 parent c2f5b65 commit 040a93b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/block/nvme.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ static void *cancel_cmdid(struct nvme_queue *nvmeq, int cmdid,
return ctx;
}

static struct nvme_queue *get_nvmeq(struct nvme_ns *ns)
static struct nvme_queue *get_nvmeq(struct nvme_dev *dev)
{
return ns->dev->queues[get_cpu() + 1];
return dev->queues[get_cpu() + 1];
}

static void put_nvmeq(struct nvme_queue *nvmeq)
Expand Down Expand Up @@ -606,7 +606,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
static int nvme_make_request(struct request_queue *q, struct bio *bio)
{
struct nvme_ns *ns = q->queuedata;
struct nvme_queue *nvmeq = get_nvmeq(ns);
struct nvme_queue *nvmeq = get_nvmeq(ns->dev);
int result = -EBUSY;

spin_lock_irq(&nvmeq->q_lock);
Expand Down Expand Up @@ -1103,7 +1103,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
/* XXX: metadata */
prps = nvme_setup_prps(dev, &c.common, sg, &length, GFP_KERNEL);

nvmeq = get_nvmeq(ns);
nvmeq = get_nvmeq(dev);
/*
* Since nvme_submit_sync_cmd sleeps, we can't keep preemption
* disabled. We may be preempted at any point, and be rescheduled
Expand Down

0 comments on commit 040a93b

Please sign in to comment.