null_blk: fix spurious IO errors after failed past-wp access

[ Upstream commit ff77042296d0a54535ddf74412c5ae92cb4ec76a ]

Steps to reproduce:

	BLKRESETZONE zone 0

	// force EIO
	pwrite(fd, buf, 4096, 4096);

	[issue more IO including zone ioctls]

It will start failing randomly including IO to unrelated zones because of
->error "reuse". Trigger can be partition detection as well if test is not
run immediately which is even more entertaining.

The fix is of course to clear ->error where necessary.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index b4078901dbcb9bbb20b9767a05ae7214fc479f99..b12e373aa956ade22fbe12434469dcae998cc3ee 100644 (file)
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -622,6 +622,7 @@ static struct nullb_cmd *__alloc_cmd(struct nullb_queue *nq)
        if (tag != -1U) {
                cmd = &nq->cmds[tag];
                cmd->tag = tag;
+               cmd->error = BLK_STS_OK;
                cmd->nq = nq;
                if (nq->dev->irqmode == NULL_IRQ_TIMER) {
                        hrtimer_init(&cmd->timer, CLOCK_MONOTONIC,
@@ -1399,6 +1400,7 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,
                cmd->timer.function = null_cmd_timer_expired;
        }
        cmd->rq = bd->rq;
+       cmd->error = BLK_STS_OK;
        cmd->nq = nq;
 
        blk_mq_start_request(bd->rq);