* [PATCH v2] nvme: add helper nvme_cleanup_cmd()
@ 2016-04-25 21:33 Ming Lin
2016-04-25 21:35 ` Keith Busch
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ming Lin @ 2016-04-25 21:33 UTC (permalink / raw)
From: Ming Lin <ming.l@ssi.samsung.com>
This hides command cleanup into nvme.h and fabrics drivers will
also use it.
Signed-off-by: Ming Lin <ming.l at ssi.samsung.com>
---
drivers/nvme/host/nvme.h | 6 ++++++
drivers/nvme/host/pci.c | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
v2:
- make this a static inline in nvme.h
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 8e8fae8..8c363ab 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -181,6 +181,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 ff3c8d7..0569cbf 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -363,8 +363,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);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] nvme: add helper nvme_cleanup_cmd()
2016-04-25 21:33 [PATCH v2] nvme: add helper nvme_cleanup_cmd() Ming Lin
@ 2016-04-25 21:35 ` Keith Busch
2016-04-26 21:09 ` Sagi Grimberg
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Keith Busch @ 2016-04-25 21:35 UTC (permalink / raw)
On Mon, Apr 25, 2016@02:33:20PM -0700, Ming Lin wrote:
> From: Ming Lin <ming.l at ssi.samsung.com>
>
> This hides command cleanup into nvme.h and fabrics drivers will
> also use it.
>
> Signed-off-by: Ming Lin <ming.l at ssi.samsung.com>
Looks good.
Reviewed-by: Keith Busch <keith.busch at intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] nvme: add helper nvme_cleanup_cmd()
2016-04-25 21:33 [PATCH v2] nvme: add helper nvme_cleanup_cmd() Ming Lin
2016-04-25 21:35 ` Keith Busch
@ 2016-04-26 21:09 ` Sagi Grimberg
2016-05-01 18:09 ` Christoph Hellwig
2016-05-02 15:12 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Sagi Grimberg @ 2016-04-26 21:09 UTC (permalink / raw)
Looks good,
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] nvme: add helper nvme_cleanup_cmd()
2016-04-25 21:33 [PATCH v2] nvme: add helper nvme_cleanup_cmd() Ming Lin
2016-04-25 21:35 ` Keith Busch
2016-04-26 21:09 ` Sagi Grimberg
@ 2016-05-01 18:09 ` Christoph Hellwig
2016-05-02 15:12 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2016-05-01 18:09 UTC (permalink / raw)
Looks fine,
Reviewed-by: Christoph Hellwig <hch at lst.de>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] nvme: add helper nvme_cleanup_cmd()
2016-04-25 21:33 [PATCH v2] nvme: add helper nvme_cleanup_cmd() Ming Lin
` (2 preceding siblings ...)
2016-05-01 18:09 ` Christoph Hellwig
@ 2016-05-02 15:12 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2016-05-02 15:12 UTC (permalink / raw)
On 04/25/2016 03:33 PM, Ming Lin wrote:
> From: Ming Lin <ming.l at ssi.samsung.com>
>
> This hides command cleanup into nvme.h and fabrics drivers will
> also use it.
Added to 4.7.
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-02 15:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-25 21:33 [PATCH v2] nvme: add helper nvme_cleanup_cmd() Ming Lin
2016-04-25 21:35 ` Keith Busch
2016-04-26 21:09 ` Sagi Grimberg
2016-05-01 18:09 ` Christoph Hellwig
2016-05-02 15:12 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.