diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-03-22 09:08:59 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2023-04-13 08:55:05 +0200 |
| commit | c5a9abfad9fb010c39defeee0c939bfa9430a5a3 (patch) | |
| tree | 0c8998dd972f945479ddc575a226ba3baa87aee1 /drivers/nvme | |
| parent | 932635356618c19317c5b306b320368525cd1961 (diff) | |
| download | linux-next-c5a9abfad9fb010c39defeee0c939bfa9430a5a3.tar.gz | |
nvmet: remove nvmet_req_cns_error_complete
Just fold it into the only caller.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/target/admin-cmd.c | 5 | ||||
| -rw-r--r-- | drivers/nvme/target/nvmet.h | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index afdf69f92599..39cb570f833d 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -721,7 +721,10 @@ static void nvmet_execute_identify(struct nvmet_req *req) break; } - nvmet_req_cns_error_complete(req); + pr_debug("unhandled identify cns %d on qid %d\n", + req->cmd->identify.cns, req->sq->qid); + req->error_loc = offsetof(struct nvme_identify, cns); + nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_SC_DNR); } /* diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index 2c1522d4063b..dc60a22646f7 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -687,14 +687,6 @@ static inline bool nvmet_use_inline_bvec(struct nvmet_req *req) req->sg_cnt <= NVMET_MAX_INLINE_BIOVEC; } -static inline void nvmet_req_cns_error_complete(struct nvmet_req *req) -{ - pr_debug("unhandled identify cns %d on qid %d\n", - req->cmd->identify.cns, req->sq->qid); - req->error_loc = offsetof(struct nvme_identify, cns); - nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_SC_DNR); -} - static inline void nvmet_req_bio_put(struct nvmet_req *req, struct bio *bio) { if (bio != &req->b.inline_bio) |