nvme: introduce struct nvme_request

[uclinux-h8/linux.git] / drivers / nvme / target / fabrics-cmd.c

diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c
index 9a97ae6..f408819 100644 (file)
--- a/drivers/nvme/target/fabrics-cmd.c
+++ b/drivers/nvme/target/fabrics-cmd.c
@@ -69,7 +69,7 @@ static void nvmet_execute_prop_get(struct nvmet_req *req)
                }
        }
 
-       req->rsp->result64 = cpu_to_le64(val);
+       req->rsp->result.u64 = cpu_to_le64(val);
        nvmet_req_complete(req, status);
 }
 
@@ -125,7 +125,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
        d = kmap(sg_page(req->sg)) + req->sg->offset;
 
        /* zero out initial completion result, assign values as needed */
-       req->rsp->result = 0;
+       req->rsp->result.u32 = 0;
 
        if (c->recfmt != 0) {
                pr_warn("invalid connect version (%d).\n",
@@ -138,7 +138,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
                pr_warn("connect attempt for invalid controller ID %#x\n",
                        d->cntlid);
                status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;
-               req->rsp->result = IPO_IATTR_CONNECT_DATA(cntlid);
+               req->rsp->result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);
                goto out;
        }
 
@@ -155,7 +155,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
 
        pr_info("creating controller %d for NQN %s.\n",
                        ctrl->cntlid, ctrl->hostnqn);
-       req->rsp->result16 = cpu_to_le16(ctrl->cntlid);
+       req->rsp->result.u16 = cpu_to_le16(ctrl->cntlid);
 
 out:
        kunmap(sg_page(req->sg));
@@ -173,7 +173,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)
        d = kmap(sg_page(req->sg)) + req->sg->offset;
 
        /* zero out initial completion result, assign values as needed */
-       req->rsp->result = 0;
+       req->rsp->result.u32 = 0;
 
        if (c->recfmt != 0) {
                pr_warn("invalid connect version (%d).\n",
@@ -191,14 +191,14 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)
        if (unlikely(qid > ctrl->subsys->max_qid)) {
                pr_warn("invalid queue id (%d)\n", qid);
                status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;
-               req->rsp->result = IPO_IATTR_CONNECT_SQE(qid);
+               req->rsp->result.u32 = IPO_IATTR_CONNECT_SQE(qid);
                goto out_ctrl_put;
        }
 
        status = nvmet_install_queue(ctrl, req);
        if (status) {
                /* pass back cntlid that had the issue of installing queue */
-               req->rsp->result16 = cpu_to_le16(ctrl->cntlid);
+               req->rsp->result.u16 = cpu_to_le16(ctrl->cntlid);
                goto out_ctrl_put;
        }