summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-07-01 16:08:51 +0200
committerKevin Wolf <kwolf@redhat.com>2010-07-14 13:09:24 +0200
commitbb44e0bbcea21e50aaed1bd54d0aa53c46cecbf1 (patch)
tree068046d111e7da95afce2e26dc80b67efbf525a9
parentblock: Fix early failure in multiwrite (diff)
downloadqemu-kvm-bb44e0bbcea21e50aaed1bd54d0aa53c46cecbf1.tar.gz
qemu-kvm-bb44e0bbcea21e50aaed1bd54d0aa53c46cecbf1.tar.bz2
qemu-kvm-bb44e0bbcea21e50aaed1bd54d0aa53c46cecbf1.zip
block: Handle multiwrite errors only when all requests have completed
Don't try to be clever by freeing all temporary data and calling all callbacks when the return value (an error) is certain. Doing so has at least two important problems: * The temporary data that is freed (qiov, possibly zero buffer) is still used by the requests that have not yet completed. * Calling the callbacks for all requests in the multiwrite means for the caller that it may free buffers etc. which are still in use. Just remember the error value and do the cleanup when all requests have completed. Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit de189a1b4a471d37a2909e97646654fc9751b52f)
-rw-r--r--block.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/block.c b/block.c
index 80f2faecd..169478046 100644
--- a/block.c
+++ b/block.c
@@ -1661,14 +1661,11 @@ static void multiwrite_cb(void *opaque, int ret)
if (ret < 0 && !mcb->error) {
mcb->error = ret;
- multiwrite_user_cb(mcb);
}
mcb->num_requests--;
if (mcb->num_requests == 0) {
- if (mcb->error == 0) {
- multiwrite_user_cb(mcb);
- }
+ multiwrite_user_cb(mcb);
qemu_free(mcb);
}
}