nvme: avoid memset for passthrough requests

nvme_clear_nvme_request() clears the nvme_command, which is unncessary
for passthrough requests as nvme_command is overwritten immediately.
Move clearing part from this helper to the caller, so that double memset
for passthrough requests is avoided.

Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Kanchan Joshi 2021-04-27 12:17:47 +05:30 committed by Christoph Hellwig
parent 4c74d1f803
commit 51ad06cd69

View File

@ -589,9 +589,6 @@ EXPORT_SYMBOL_NS_GPL(nvme_put_ns, NVME_TARGET_PASSTHRU);
static inline void nvme_clear_nvme_request(struct request *req) static inline void nvme_clear_nvme_request(struct request *req)
{ {
struct nvme_command *cmd = nvme_req(req)->cmd;
memset(cmd, 0, sizeof(*cmd));
nvme_req(req)->retries = 0; nvme_req(req)->retries = 0;
nvme_req(req)->flags = 0; nvme_req(req)->flags = 0;
req->rq_flags |= RQF_DONTPREP; req->rq_flags |= RQF_DONTPREP;
@ -903,8 +900,10 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req)
struct nvme_command *cmd = nvme_req(req)->cmd; struct nvme_command *cmd = nvme_req(req)->cmd;
blk_status_t ret = BLK_STS_OK; blk_status_t ret = BLK_STS_OK;
if (!(req->rq_flags & RQF_DONTPREP)) if (!(req->rq_flags & RQF_DONTPREP)) {
nvme_clear_nvme_request(req); nvme_clear_nvme_request(req);
memset(cmd, 0, sizeof(*cmd));
}
switch (req_op(req)) { switch (req_op(req)) {
case REQ_OP_DRV_IN: case REQ_OP_DRV_IN: