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/sheepdog.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/sheepdog.c')
| -rw-r--r-- | block/sheepdog.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c index 48fc165422..33e0a33824 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1648,8 +1648,7 @@ static int sd_prealloc(const char *filename, Error **errp) int ret; blk = blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, - errp); + BDRV_O_RDWR | BDRV_O_PROTOCOL, errp); if (blk == NULL) { ret = -EIO; goto out_with_err_set; @@ -1845,7 +1844,7 @@ static int sd_create(const char *filename, QemuOpts *opts, } blk = blk_new_open(backing_file, NULL, NULL, - BDRV_O_PROTOCOL | BDRV_O_CACHE_WB, errp); + BDRV_O_PROTOCOL, errp); if (blk == NULL) { ret = -EIO; goto out; |