nvmet: remove extra variable in id-ns handler
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Wed, 10 Feb 2021 05:47:55 +0000 (21:47 -0800)
committerChristoph Hellwig <hch@lst.de>
Wed, 10 Feb 2021 15:38:04 +0000 (16:38 +0100)
In nvmet_execute_identify_ns() local variable ctrl is accessed only in
one place, remove that and directly use it from nvmet_req->sq->ctrl.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/admin-cmd.c

index f325334..552da81 100644 (file)
@@ -462,7 +462,6 @@ out:
 
 static void nvmet_execute_identify_ns(struct nvmet_req *req)
 {
-       struct nvmet_ctrl *ctrl = req->sq->ctrl;
        struct nvme_id_ns *id;
        u16 status;
 
@@ -523,7 +522,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
 
        id->lbaf[0].ds = req->ns->blksize_shift;
 
-       if (ctrl->pi_support && nvmet_ns_has_pi(req->ns)) {
+       if (req->sq->ctrl->pi_support && nvmet_ns_has_pi(req->ns)) {
                id->dpc = NVME_NS_DPC_PI_FIRST | NVME_NS_DPC_PI_LAST |
                          NVME_NS_DPC_PI_TYPE1 | NVME_NS_DPC_PI_TYPE2 |
                          NVME_NS_DPC_PI_TYPE3;