nvme: add helper nvme_cleanup_cmd()

This hides command cleanup into nvme.h and fabrics drivers will
also use it.

Signed-off-by: Ming Lin <ming.l@ssi.samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 6904242db1ac07403c331b18796f6c2bf5382aec)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index de88d2acf3aca67afbfd31a49ae44432e4920a61..70dbc7eb65116eb8f86214a84a985f8b7042e53f 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -169,6 +169,12 @@ static inline unsigned nvme_map_len(struct request *rq)
                return blk_rq_bytes(rq);
 }
 
+static inline void nvme_cleanup_cmd(struct request *req)
+{
+       if (req->cmd_flags & REQ_DISCARD)
+               kfree(req->completion_data);
+}
+
 static inline int nvme_error_status(u16 status)
 {
        switch (status & 0x7ff) {

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 3c157476358c1c127b6163355e92bff3e95e781f..d3b21ba65ef76d137d0df3952cce3226dfd98847 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -334,8 +334,7 @@ static void nvme_free_iod(struct nvme_dev *dev, struct request *req)
        __le64 **list = iod_list(req);
        dma_addr_t prp_dma = iod->first_dma;
 
-       if (req->cmd_flags & REQ_DISCARD)
-               kfree(req->completion_data);
+       nvme_cleanup_cmd(req);
 
        if (iod->npages == 0)
                dma_pool_free(dev->prp_small_pool, list[0], prp_dma);