Skip to content

Commit

Permalink
NVMe:Remove unreachable code in nvme_abort_req
Browse files Browse the repository at this point in the history
Removing unreachable code from nvme_abort_req as nvme_submit_cmd has no
failure status to return.

Signed-off-by: Sunad Bhandary <sunad.s@samsung.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Sunad Bhandary authored and Jens Axboe committed Aug 19, 2015
1 parent 81f03fe commit e3f879b
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions drivers/block/nvme-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,8 @@ static void *nvme_finish_cmd(struct nvme_queue *nvmeq, int tag,
*
* Safe to use from interrupt context
*/
static int __nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)
static void __nvme_submit_cmd(struct nvme_queue *nvmeq,
struct nvme_command *cmd)
{
u16 tail = nvmeq->sq_tail;

Expand All @@ -397,18 +398,14 @@ static int __nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)
tail = 0;
writel(tail, nvmeq->q_db);
nvmeq->sq_tail = tail;

return 0;
}

static int nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)
static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)
{
unsigned long flags;
int ret;
spin_lock_irqsave(&nvmeq->q_lock, flags);
ret = __nvme_submit_cmd(nvmeq, cmd);
__nvme_submit_cmd(nvmeq, cmd);
spin_unlock_irqrestore(&nvmeq->q_lock, flags);
return ret;
}

static __le64 **iod_list(struct nvme_iod *iod)
Expand Down Expand Up @@ -1079,7 +1076,8 @@ static int nvme_submit_async_admin_req(struct nvme_dev *dev)
c.common.command_id = req->tag;

blk_mq_free_request(req);
return __nvme_submit_cmd(nvmeq, &c);
__nvme_submit_cmd(nvmeq, &c);
return 0;
}

static int nvme_submit_admin_async_cmd(struct nvme_dev *dev,
Expand All @@ -1102,7 +1100,8 @@ static int nvme_submit_admin_async_cmd(struct nvme_dev *dev,

cmd->common.command_id = req->tag;

return nvme_submit_cmd(nvmeq, cmd);
nvme_submit_cmd(nvmeq, cmd);
return 0;
}

static int adapter_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)
Expand Down Expand Up @@ -1314,12 +1313,7 @@ static void nvme_abort_req(struct request *req)

dev_warn(nvmeq->q_dmadev, "Aborting I/O %d QID %d\n", req->tag,
nvmeq->qid);
if (nvme_submit_cmd(dev->queues[0], &cmd) < 0) {
dev_warn(nvmeq->q_dmadev,
"Could not abort I/O %d QID %d",
req->tag, nvmeq->qid);
blk_mq_free_request(abort_req);
}
nvme_submit_cmd(dev->queues[0], &cmd);
}

static void nvme_cancel_queue_ios(struct request *req, void *data, bool reserved)
Expand Down

0 comments on commit e3f879b

Please sign in to comment.