[23/56] block: fix bdrv_flush() ordering in bdrv_close()

Message ID 1376406680-16302-24-git-send-email-mdroth@linux.vnet.ibm.com
State New
Headers show

Commit Message

Michael Roth Aug. 13, 2013, 3:10 p.m.
From: Stefan Hajnoczi <stefanha@redhat.com>

Since 80ccf93b we flush the block device during close.  The
bdrv_drain_all() call should come before bdrv_flush() to ensure guest
write requests have completed.  Otherwise we may miss pending writes
when flushing.

Call bdrv_drain_all() again for safety as the final step after
bdrv_flush().  This should not be necessary but we can be paranoid here
in case bdrv_flush() left I/O pending.

Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 58fda173e1156d24e5ff62361774715152188a07)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
 block.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


diff --git a/block.c b/block.c
index 3f87489..c7c3e06 100644
--- a/block.c
+++ b/block.c
@@ -1349,11 +1349,12 @@  void bdrv_reopen_abort(BDRVReopenState *reopen_state)
 void bdrv_close(BlockDriverState *bs)
-    bdrv_flush(bs);
     if (bs->job) {
-    bdrv_drain_all();
+    bdrv_drain_all(); /* complete I/O */
+    bdrv_flush(bs);
+    bdrv_drain_all(); /* in case flush left pending I/O */
     notifier_list_notify(&bs->close_notifiers, bs);
     if (bs->drv) {