david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/iscsi: allow fall back to WRITE SAME without UNMAP

Browse Source 
if the iscsi driver receives a write zeroes request with
the BDRV_REQ_MAY_UNMAP flag set it fails with -ENOTSUP
if the iscsi target does not support WRITE SAME with
UNMAP. However, the BDRV_REQ_MAY_UNMAP is only a hint
and writing zeroes with WRITE SAME will still be
better than falling back to writing zeroes with WRITE16.

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Lieven 2014-04-28 13:23:25 +02:00 committed by Paolo Bonzini
parent d383c625e2
commit dbe5c58f2a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/iscsi.c
View File

@ -809,13 +809,14 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num,
return -EINVAL; return -EINVAL;
} }
if (!(flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->has_write_same) { if ((flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->lbp.lbpws) {
/* WRITE SAME without UNMAP is not supported by the target */ /* WRITE SAME with UNMAP is not supported by the target,
return -ENOTSUP; * fall back and try WRITE SAME without UNMAP */
flags &= ~BDRV_REQ_MAY_UNMAP;
} }
if ((flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->lbp.lbpws) { if (!(flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->has_write_same) {
/* WRITE SAME with UNMAP is not supported by the target */ /* WRITE SAME without UNMAP is not supported by the target */
return -ENOTSUP; return -ENOTSUP;
} }