Patchwork [03/19] block: make bdrv_set_enable_write_cache() modify open_flags

login
register
mail settings
Submitter Kevin Wolf
Date Sept. 24, 2012, 2:26 p.m.
Message ID <1348496808-8159-4-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/186431/
State New
Headers show

Comments

Kevin Wolf - Sept. 24, 2012, 2:26 p.m.
From: Jeff Cody <jcody@redhat.com>

bdrv_set_enable_write_cache() sets the bs->enable_write_cache flag,
but without the flag recorded in bs->open_flags, then next time
a reopen() is performed the enable_write_cache setting may be
inadvertently lost.

This will set the flag in open_flags, so it is preserved across
reopens.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

Patch

diff --git a/block.c b/block.c
index 4c0e7f5..458bcc9 100644
--- a/block.c
+++ b/block.c
@@ -2168,6 +2168,13 @@  int bdrv_enable_write_cache(BlockDriverState *bs)
 void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce)
 {
     bs->enable_write_cache = wce;
+
+    /* so a reopen() will preserve wce */
+    if (wce) {
+        bs->open_flags |= BDRV_O_CACHE_WB;
+    } else {
+        bs->open_flags &= ~BDRV_O_CACHE_WB;
+    }
 }
 
 int bdrv_is_encrypted(BlockDriverState *bs)