aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nvme/target/admin-cmd.c
diff options
context:
space:
mode:
authorParav Pandit <parav@mellanox.com>2017-02-28 00:21:02 -0500
committerJens Axboe <axboe@fb.com>2017-04-04 11:48:23 -0400
commit4151dd9a58c6b2758514fc88a1a3b02f9ab8b076 (patch)
tree8d02b78871a0de940662498eb6ecaa05a16105f1 /drivers/nvme/target/admin-cmd.c
parent4459e042970b33b94ef0e2426ee22edf233da2f5 (diff)
nvmet: Fixed avoided printing nvmet: twice in error logs.
This patch avoids printing "nvmet:" twice in error logs as its already coming through pr_fmt macro. Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Parav Pandit <parav@mellanox.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/target/admin-cmd.c')
-rw-r--r--drivers/nvme/target/admin-cmd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index a7bcff45f437..42b8bba97e7d 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -487,13 +487,13 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req)
487 req->ns = NULL; 487 req->ns = NULL;
488 488
489 if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) { 489 if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) {
490 pr_err("nvmet: got admin cmd %d while CC.EN == 0\n", 490 pr_err("got admin cmd %d while CC.EN == 0\n",
491 cmd->common.opcode); 491 cmd->common.opcode);
492 return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR; 492 return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
493 } 493 }
494 if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) { 494 if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {
495 pr_err("nvmet: got admin cmd %d while CSTS.RDY == 0\n", 495 pr_err("got admin cmd %d while CSTS.RDY == 0\n",
496 cmd->common.opcode); 496 cmd->common.opcode);
497 return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR; 497 return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
498 } 498 }
499 499
@@ -545,6 +545,6 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req)
545 return 0; 545 return 0;
546 } 546 }
547 547
548 pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode); 548 pr_err("unhandled cmd %d\n", cmd->common.opcode);
549 return NVME_SC_INVALID_OPCODE | NVME_SC_DNR; 549 return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;
550} 550}