Commit ced6b5da authored Oct 09, 2018 by Matias Bjørling Committed by Greg Kroah-Hartman Nov 24, 2019

lightnvm: pblk: fix rqd.error return value in pblk_blk_erase_sync



[ Upstream commit 4b5d56edb8fc565c5db029aecaea598eadfba7f6 ]

rqd.error is masked by the return value of pblk_submit_io_sync.
The rqd structure is then passed on to the end_io function, which
assumes that any error should lead to a chunk being marked
offline/bad. Since the pblk_submit_io_sync can fail before the
command is issued to the device, the error value maybe not correspond
to a media failure, leading to chunks being immaturely retired.

Also, the pblk_blk_erase_sync function prints an error message in case
the erase fails. Since the caller prints an error message by itself,
remove the error message in this function.

Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Reviewed-by: Javier González <javier@cnexlabs.com>
Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e9995609

drivers/lightnvm/pblk-core.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -893,10 +893,8 @@ static void pblk_setup_e_rq(struct pblk pblk, struct nvm_rq rqd,

		static int pblk_blk_erase_sync(struct pblk *pblk, struct ppa_addr ppa)
		{
		struct nvm_rq rqd;
		int ret = 0;

		memset(&rqd, 0, sizeof(struct nvm_rq));
		struct nvm_rq rqd = {NULL};
		int ret;

		pblk_setup_e_rq(pblk, &rqd, ppa);

		@@ -904,19 +902,6 @@ static int pblk_blk_erase_sync(struct pblk *pblk, struct ppa_addr ppa)
		* with writes. Thus, there is no need to take the LUN semaphore.
		*/
		ret = pblk_submit_io_sync(pblk, &rqd);
		if (ret) {
		struct nvm_tgt_dev *dev = pblk->dev;
		struct nvm_geo *geo = &dev->geo;

		pblk_err(pblk, "could not sync erase line:%d,blk:%d\n",
		pblk_ppa_to_line(ppa),
		pblk_ppa_to_pos(geo, ppa));

		rqd.error = ret;
		goto out;
		}

		out:
		rqd.private = pblk;
		__pblk_end_io_erase(pblk, &rqd);