On Tue, Mar 5, 2019 at 2:54 PM Igor Konopko <[email protected]> wrote: > > Currently in case of read errors, bi_status is not set properly which > leads to returning inproper data to higher layer. This patch fix that > by setting proper status in case of read errors > > Patch also removes unnecessary warn_once(), which does not make sense > in that place, since user bio is not used for interation with drive > and thus bi_status will not be set here. > > Signed-off-by: Igor Konopko <[email protected]> > --- > drivers/lightnvm/pblk-read.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c > index 1f9b319..6569746 100644 > --- a/drivers/lightnvm/pblk-read.c > +++ b/drivers/lightnvm/pblk-read.c > @@ -175,11 +175,10 @@ static void pblk_read_check_rand(struct pblk *pblk, > struct nvm_rq *rqd, > WARN_ONCE(j != rqd->nr_ppas, "pblk: corrupted random request\n"); > } > > -static void pblk_end_user_read(struct bio *bio) > +static void pblk_end_user_read(struct bio *bio, int error) > { > -#ifdef CONFIG_NVM_PBLK_DEBUG > - WARN_ONCE(bio->bi_status, "pblk: corrupted read bio\n"); > -#endif > + if (error && error != NVM_RSP_WARN_HIGHECC) > + bio_io_error(bio); > bio_endio(bio); > } > > @@ -219,7 +218,7 @@ static void pblk_end_io_read(struct nvm_rq *rqd) > struct pblk_g_ctx *r_ctx = nvm_rq_to_pdu(rqd); > struct bio *bio = (struct bio *)r_ctx->private; > > - pblk_end_user_read(bio); > + pblk_end_user_read(bio, rqd->error); > __pblk_end_io_read(pblk, rqd, true); > } > > @@ -292,7 +291,7 @@ static void pblk_end_partial_read(struct nvm_rq *rqd) > rqd->bio = NULL; > rqd->nr_ppas = nr_secs; > > - bio_endio(bio); > + pblk_end_user_read(bio, rqd->error); > __pblk_end_io_read(pblk, rqd, false); > } > > -- > 2.9.5 >
Looks good to me, Reviewed-by: Hans Holmberg <[email protected]>
