Commit 6904242d authored by Ming Lin's avatar Ming Lin Committed by Jens Axboe

nvme: add helper nvme_cleanup_cmd()

This hides command cleanup into nvme.h and fabrics drivers will
also use it.
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f866fc42
...@@ -182,6 +182,12 @@ static inline unsigned nvme_map_len(struct request *rq) ...@@ -182,6 +182,12 @@ static inline unsigned nvme_map_len(struct request *rq)
return blk_rq_bytes(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) static inline int nvme_error_status(u16 status)
{ {
switch (status & 0x7ff) { switch (status & 0x7ff) {
......
...@@ -321,8 +321,7 @@ static void nvme_free_iod(struct nvme_dev *dev, struct request *req) ...@@ -321,8 +321,7 @@ static void nvme_free_iod(struct nvme_dev *dev, struct request *req)
__le64 **list = iod_list(req); __le64 **list = iod_list(req);
dma_addr_t prp_dma = iod->first_dma; dma_addr_t prp_dma = iod->first_dma;
if (req->cmd_flags & REQ_DISCARD) nvme_cleanup_cmd(req);
kfree(req->completion_data);
if (iod->npages == 0) if (iod->npages == 0)
dma_pool_free(dev->prp_small_pool, list[0], prp_dma); dma_pool_free(dev->prp_small_pool, list[0], prp_dma);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment