aboutsummaryrefslogtreecommitdiff
path: root/block/crypto.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-03-15 14:34:37 +0100
committerKevin Wolf <kwolf@redhat.com>2016-03-30 12:16:01 +0200
commit72e775c7d9de3eaa35a6edaf9d87cedee149d0f5 (patch)
tree6146ef9c8ce3f93f11df617a2e6d4dfeba72b82e /block/crypto.c
parente4b24b497e4171a89da541fe83c3dc84c51d42da (diff)
block: Always set writeback mode in blk_new_open()
All callers of blk_new_open() either don't rely on the WCE bit set after blk_new_open() because they explicitly set it anyway, or they pass BDRV_O_CACHE_WB unconditionally. This patch changes blk_new_open() so that it always enables writeback mode and asserts that BDRV_O_CACHE_WB is clear. For those callers that used to pass BDRV_O_CACHE_WB unconditionally, the flag is removed now. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/crypto.c')
-rw-r--r--block/crypto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/crypto.c b/block/crypto.c
index 3db0965fe1..be3498581c 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -121,8 +121,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block,
}
data->blk = blk_new_open(data->filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
- errp);
+ BDRV_O_RDWR | BDRV_O_PROTOCOL, errp);
if (!data->blk) {
return -1;
}