diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-03-15 14:34:37 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-30 12:16:01 +0200 |
| commit | 72e775c7d9de3eaa35a6edaf9d87cedee149d0f5 (patch) | |
| tree | 6146ef9c8ce3f93f11df617a2e6d4dfeba72b82e /block/qcow2.c | |
| parent | e4b24b497e4171a89da541fe83c3dc84c51d42da (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/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 73c4f6b0ba..056525c7fd 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2168,8 +2168,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, } blk = blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, - &local_err); + BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err); if (blk == NULL) { error_propagate(errp, local_err); return -EIO; @@ -2233,8 +2232,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, options = qdict_new(); qdict_put(options, "driver", qstring_from_str("qcow2")); blk = blk_new_open(filename, NULL, options, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, - &local_err); + BDRV_O_RDWR | BDRV_O_NO_FLUSH, &local_err); if (blk == NULL) { error_propagate(errp, local_err); ret = -EIO; @@ -2295,8 +2293,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, options = qdict_new(); qdict_put(options, "driver", qstring_from_str("qcow2")); blk = blk_new_open(filename, NULL, options, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING, - &local_err); + BDRV_O_RDWR | BDRV_O_NO_BACKING, &local_err); if (blk == NULL) { error_propagate(errp, local_err); ret = -EIO; |