nvmet: remove nvmet_req_cns_error_complete

Christoph Hellwig · Christoph Hellwig · commit c5a9abfad9fb · 2023-04-13T08:55:05.000+02:00
Just fold it into the only caller.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Sagi Grimberg &lt;sagi@grimberg.me&gt;
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,10 @@ static void nvmet_execute_identify(struct nvmet_req *req)`
`721`	`721`	`break;`
`722`	`722`	`}`
`723`	`723`
`724`		`- nvmet_req_cns_error_complete(req);`
	`724`	`+ pr_debug("unhandled identify cns %d on qid %d\n",`
	`725`	`+ req->cmd->identify.cns, req->sq->qid);`
	`726`	`+ req->error_loc = offsetof(struct nvme_identify, cns);`
	`727`	`+ nvmet_req_complete(req, NVME_SC_INVALID_FIELD \| NVME_SC_DNR);`
`725`	`728`	`}`
`726`	`729`
`727`	`730`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -687,14 +687,6 @@ static inline bool nvmet_use_inline_bvec(struct nvmet_req *req)`
`687`	`687`	`req->sg_cnt <= NVMET_MAX_INLINE_BIOVEC;`
`688`	`688`	`}`
`689`	`689`
`690`		`-static inline void nvmet_req_cns_error_complete(struct nvmet_req *req)`
`691`		`-{`
`692`		`- pr_debug("unhandled identify cns %d on qid %d\n",`
`693`		`- req->cmd->identify.cns, req->sq->qid);`
`694`		`- req->error_loc = offsetof(struct nvme_identify, cns);`
`695`		`- nvmet_req_complete(req, NVME_SC_INVALID_FIELD \| NVME_SC_DNR);`
`696`		`-}`
`697`		`-`
`698`	`690`	`static inline void nvmet_req_bio_put(struct nvmet_req req, struct bio bio)`
`699`	`691`	`{`
`700`	`692`	`if (bio != &req->b.inline_bio)`