lkml.org 
[lkml]   [2015]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] lightnvm: fix bio submission issue
From
Date
On 12/09/2015 02:26 PM, Wenwei Tao wrote:
> put bio when submission fails, since we get it
> before submission. And return error when backend
> device driver doesn't provide a submit_io method,
> thus we can end IO properly.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
> drivers/lightnvm/gennvm.c | 2 +-
> drivers/lightnvm/rrpc.c | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
> index 35dde84..c8e53c5 100644
> --- a/drivers/lightnvm/gennvm.c
> +++ b/drivers/lightnvm/gennvm.c
> @@ -343,7 +343,7 @@ static void gennvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
> static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
> {
> if (!dev->ops->submit_io)
> - return 0;
> + return -ENODEV;
>
> /* Convert address space */
> gennvm_generic_to_addr_mode(dev, rqd);
> diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
> index 75e59c3..77b066f 100644
> --- a/drivers/lightnvm/rrpc.c
> +++ b/drivers/lightnvm/rrpc.c
> @@ -636,11 +636,12 @@ static int rrpc_end_io(struct nvm_rq *rqd, int error)
> if (bio_data_dir(rqd->bio) == WRITE)
> rrpc_end_io_write(rrpc, rrqd, laddr, npages);
>
> + bio_put(rqd->bio);
> +
> if (rrqd->flags & NVM_IOTYPE_GC)
> return 0;
>
> rrpc_unlock_rq(rrpc, rqd);
> - bio_put(rqd->bio);
>
> if (npages > 1)
> nvm_dev_dma_free(rrpc->dev, rqd->ppa_list, rqd->dma_ppa_list);
> @@ -827,6 +828,7 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
> err = nvm_submit_io(rrpc->dev, rqd);
> if (err) {
> pr_err("rrpc: I/O submission failed: %d\n", err);
> + bio_put(bio);
> return NVM_IO_ERR;
> }
>
>
Thanks Tao, applied :)


\
 
 \ /
  Last update: 2015-12-12 20:21    [W:0.022 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site