[19/74] xen-blkback: fix dispatch_rw_block_io() error path
3.2.43-rc1 review patch. If anyone has any objections, please let me know.
--
From: Jan Beulich
commit 0e5e098ac22dae38f957e951b70d3cf73beff0f7 upstream.
Commit 7708992 ("xen/blkback: Seperate the bio allocation and the bio
submission") consolidated the pendcnt updates to just a single write,
neglecting the fact that the error path relied on it getting set to 1
up front (such that the decrement in __end_block_io_op() would actually
drop the count to zero, triggering the necessary cleanup actions).
Also remove a misleading and a stale (after said commit) comment.
Signed-off-by: Jan Beulich
Signed-off-by: Konrad Rzeszutek Wilk
Signed-off-by: Ben Hutchings
---
drivers/block/xen-blkback/blkback.c |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -758,13 +758,7 @@ static int dispatch_rw_block_io(struct x
}
}
- /*
-* We set it one so that the last submit_bio does not have to call
-* atomic_inc.
-*/
atomic_set(_req->pendcnt, nbio);
-
- /* Get a reference count for the disk queue and start sending I/O */
blk_start_plug();
for (i = 0; i < nbio; i++)
@@ -792,6 +786,7 @@ static int dispatch_rw_block_io(struct x
fail_put_bio:
for (i = 0; i < nbio; i++)
bio_put(biolist[i]);
+ atomic_set(_req->pendcnt, 1);
__end_block_io_op(pending_req, -EINVAL);
msleep(1); /* back off a bit */
return -EIO;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[19/74] xen-blkback: fix dispatch_rw_block_io() error path
3.2.43-rc1 review patch. If anyone has any objections, please let me know. -- From: Jan Beulich jbeul...@suse.com commit 0e5e098ac22dae38f957e951b70d3cf73beff0f7 upstream. Commit 7708992 (xen/blkback: Seperate the bio allocation and the bio submission) consolidated the pendcnt updates to just a single write, neglecting the fact that the error path relied on it getting set to 1 up front (such that the decrement in __end_block_io_op() would actually drop the count to zero, triggering the necessary cleanup actions). Also remove a misleading and a stale (after said commit) comment. Signed-off-by: Jan Beulich jbeul...@suse.com Signed-off-by: Konrad Rzeszutek Wilk konrad.w...@oracle.com Signed-off-by: Ben Hutchings b...@decadent.org.uk --- drivers/block/xen-blkback/blkback.c |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -758,13 +758,7 @@ static int dispatch_rw_block_io(struct x } } - /* -* We set it one so that the last submit_bio does not have to call -* atomic_inc. -*/ atomic_set(pending_req-pendcnt, nbio); - - /* Get a reference count for the disk queue and start sending I/O */ blk_start_plug(plug); for (i = 0; i nbio; i++) @@ -792,6 +786,7 @@ static int dispatch_rw_block_io(struct x fail_put_bio: for (i = 0; i nbio; i++) bio_put(biolist[i]); + atomic_set(pending_req-pendcnt, 1); __end_block_io_op(pending_req, -EINVAL); msleep(1); /* back off a bit */ return -EIO; -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
