From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Mon, 4 Mar 2013 14:02:31 +0000 (+0100)
Subject: qcow2: flush refcount cache correctly in qcow2_write_snapshots()
X-Git-Tag: v1.4.1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d47b243d6dff50906bbdba1acb1090ee0c4937f;p=thirdparty%2Fqemu.git

qcow2: flush refcount cache correctly in qcow2_write_snapshots()

Since qcow2 metadata is cached we need to flush the caches, not just the
underlying file.  Use bdrv_flush(bs) instead of bdrv_flush(bs->file).

Also add the error return path when bdrv_flush() fails and move the
flush after checking for qcow2_alloc_clusters() failure so that the
qcow2_alloc_clusters() error return value takes precedence.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit f6977f15561973d4a67b6aa46da88aa678c505dd)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index eb8fcd55497..f4719d9909c 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -180,11 +180,14 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
 
     /* Allocate space for the new snapshot list */
     snapshots_offset = qcow2_alloc_clusters(bs, snapshots_size);
-    bdrv_flush(bs->file);
     offset = snapshots_offset;
     if (offset < 0) {
         return offset;
     }
+    ret = bdrv_flush(bs);
+    if (ret < 0) {
+        return ret;
+    }
 
     /* Write all snapshots to the new list */
     for(i = 0; i < s->nb_snapshots; i++) {