Commit 1014170b authored by Eric Blake's avatar Eric Blake Committed by Stefan Hajnoczi
Browse files

gluster: Switch .bdrv_co_discard() to byte-based 



Another step towards killing off sector-based block APIs.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1468624988-423-12-git-send-email-eblake@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent aba76e2f

block/gluster.c

+6 −8
Original line number Diff line number Diff line
@@ -724,14 +724,12 @@ error: 
}



#ifdef CONFIG_GLUSTERFS_DISCARD

static coroutine_fn int qemu_gluster_co_discard(BlockDriverState *bs,

        int64_t sector_num, int nb_sectors)

static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,

                                                 int64_t offset, int size)

{

    int ret;

    GlusterAIOCB acb;

    BDRVGlusterState *s = bs->opaque;

    size_t size = nb_sectors * BDRV_SECTOR_SIZE;

    off_t offset = sector_num * BDRV_SECTOR_SIZE;



    acb.size = 0;

    acb.ret = 0;
@@ -976,7 +974,7 @@ static BlockDriver bdrv_gluster = { 
    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_discard              = qemu_gluster_co_discard,

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif

#ifdef CONFIG_GLUSTERFS_ZEROFILL

    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,
@@ -1004,7 +1002,7 @@ static BlockDriver bdrv_gluster_tcp = { 
    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_discard              = qemu_gluster_co_discard,

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif

#ifdef CONFIG_GLUSTERFS_ZEROFILL

    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,
@@ -1032,7 +1030,7 @@ static BlockDriver bdrv_gluster_unix = { 
    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_discard              = qemu_gluster_co_discard,

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif

#ifdef CONFIG_GLUSTERFS_ZEROFILL

    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,
@@ -1060,7 +1058,7 @@ static BlockDriver bdrv_gluster_rdma = { 
    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_discard              = qemu_gluster_co_discard,

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif

#ifdef CONFIG_GLUSTERFS_ZEROFILL

    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,