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

iscsi: Switch .bdrv_co_discard() to byte-based

Browse Source 
Another step towards killing off sector-based block APIs.

Unlike write_zeroes, where we can be handed unaligned requests
and must fail gracefully with -ENOTSUP for a fallback, we are
guaranteed that discard requests are always aligned because the
block layer already ignored unaligned head/tail.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1468624988-423-13-git-send-email-eblake@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Eric Blake 2016-07-15 17:23:01 -06:00 committed by Stefan Hajnoczi
parent 1014170b82
commit 97c7e85cfe
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/iscsi.c
View File

@ -1042,24 +1042,21 @@ iscsi_getlength(BlockDriverState *bs)
} }
static int static int
coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num, coroutine_fn iscsi_co_pdiscard(BlockDriverState *bs, int64_t offset, int count)
int nb_sectors)
{ {
IscsiLun *iscsilun = bs->opaque; IscsiLun *iscsilun = bs->opaque;
struct IscsiTask iTask; struct IscsiTask iTask;
struct unmap_list list; struct unmap_list list;
if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { assert(is_byte_request_lun_aligned(offset, count, iscsilun));
return -EINVAL;
}
if (!iscsilun->lbp.lbpu) { if (!iscsilun->lbp.lbpu) {
/* UNMAP is not supported by the target */ /* UNMAP is not supported by the target */
return 0; return 0;
} }
list.lba = sector_qemu2lun(sector_num, iscsilun); list.lba = offset / iscsilun->block_size;
list.num = sector_qemu2lun(nb_sectors, iscsilun); list.num = count / iscsilun->block_size;
iscsi_co_init_iscsitask(iscsilun, &iTask); iscsi_co_init_iscsitask(iscsilun, &iTask);
retry: retry:
@ -1094,7 +1091,8 @@ retry:
return iTask.err_code; return iTask.err_code;
} }
iscsi_allocmap_set_invalid(iscsilun, sector_num, nb_sectors); iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,
count >> BDRV_SECTOR_BITS);
return 0; return 0;
} }
@ -1998,7 +1996,7 @@ static BlockDriver bdrv_iscsi = {
.bdrv_refresh_limits = iscsi_refresh_limits, .bdrv_refresh_limits = iscsi_refresh_limits,
.bdrv_co_get_block_status = iscsi_co_get_block_status, .bdrv_co_get_block_status = iscsi_co_get_block_status,
.bdrv_co_discard = iscsi_co_discard, .bdrv_co_pdiscard = iscsi_co_pdiscard,
.bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes, .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,
.bdrv_co_readv = iscsi_co_readv, .bdrv_co_readv = iscsi_co_readv,
.bdrv_co_writev_flags = iscsi_co_writev_flags, .bdrv_co_writev_flags = iscsi_co_writev_flags,