[Qemu-devel] [PATCH 0/2] block: Multiwrite error path fixes

[Qemu-devel] [PATCH 0/2] block: Multiwrite error path fixes

[Kevin Wolf]

Kevin Wolf (2):
  block: Fix error code in multiwrite for immediate failures
  block: Fix multiwrite memory leak in error case

 block.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/2] block: Fix error code in multiwrite for immediate failures

[Kevin Wolf]

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block.c b/block.c
index 9233af1..ae5aba3 100644
--- a/block.c
+++ b/block.c
@@ -1890,10 +1890,10 @@ int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs)
             // submitted yet. Otherwise we'll wait for the submitted AIOs to
             // complete and report the error in the callback.
             if (mcb->num_requests == 0) {
-                reqs[i].error = EIO;
+                reqs[i].error = -EIO;
                 goto fail;
             } else {
-                mcb->error = EIO;
+                mcb->error = -EIO;
                 break;
             }
         } else {
-- 
1.6.6.1

[Qemu-devel] [PATCH 2/2] block: Fix multiwrite memory leak in error case

[Kevin Wolf]

Previously multiwrite_user_cb was never called if a request in the multiwrite
batch failed right away because it did set mcb->error immediately. Make it look
more like a normal callback to fix this.

Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/block.c b/block.c
index ae5aba3..ed4c819 100644
--- a/block.c
+++ b/block.c
@@ -1893,7 +1893,8 @@ int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs)
                 reqs[i].error = -EIO;
                 goto fail;
             } else {
-                mcb->error = -EIO;
+                mcb->num_requests++;
+                multiwrite_cb(mcb, -EIO);
                 break;
             }
         } else {
-- 
1.6.6.1

Re: [Qemu-devel] [PATCH 0/2] block: Multiwrite error path fixes

[Aurelien Jarno]

On Tue, Apr 06, 2010 at 06:24:05PM +0200, Kevin Wolf wrote:
> Kevin Wolf (2):
>   block: Fix error code in multiwrite for immediate failures
>   block: Fix multiwrite memory leak in error case
> 

Thanks, both applied.

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net