diff options
| author | Eric Blake <eblake@redhat.com> | 2016-05-03 16:39:06 -0600 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-12 15:22:09 +0200 |
| commit | 4df863f336b76faf55f796eed7cd7f7c55ec0130 (patch) | |
| tree | ce48b867fdb768a0ff01c743e81f688a544e3a1c /block/raw_bsd.c | |
| parent | 2928abce6d1d426d37c0a9bd5f85fb95cf33f709 (diff) | |
block: Make supported_write_flags a per-bds property
Pre-patch, .supported_write_flags lives at the driver level, which
means we are blindly declaring that all block devices using a
given driver will either equally support FUA, or that we need a
fallback at the block layer. But there are drivers where FUA
support is a per-block decision: the NBD block driver is dependent
on the remote server advertising NBD_FLAG_SEND_FUA (and has
fallback code to duplicate the flush that the block layer would do
if NBD had not set .supported_write_flags); and the iscsi block
driver is dependent on the mode sense bits advertised by the
underlying device (and is currently silently ignoring FUA requests
if the underlying device does not support FUA).
The fix is to make supported flags as a per-BDS option, set during
.bdrv_open(). This patch moves the variable and fixes NBD and iscsi
to set it only conditionally; later patches will then further
simplify the NBD driver to quit duplicating work done at the block
layer, as well as tackle the fact that SCSI does not support FUA
semantics on WRITESAME(10/16) but only on WRITE(10/16).
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/raw_bsd.c')
| -rw-r--r-- | block/raw_bsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 5e65fb02d4..1a1618ef07 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -204,6 +204,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { bs->sg = bs->file->bs->sg; + bs->supported_write_flags = BDRV_REQ_FUA; if (bs->probed && !bdrv_is_read_only(bs)) { fprintf(stderr, @@ -250,7 +251,6 @@ BlockDriver bdrv_raw = { .bdrv_create = &raw_create, .bdrv_co_readv = &raw_co_readv, .bdrv_co_writev_flags = &raw_co_writev_flags, - .supported_write_flags = BDRV_REQ_FUA, .bdrv_co_write_zeroes = &raw_co_write_zeroes, .bdrv_co_discard = &raw_co_discard, .bdrv_co_get_block_status = &raw_co_get_block_status, |