mirror of https://github.com/xemu-project/xemu.git
gluster: Switch to .bdrv_co_block_status()
We are gradually moving away from sector-based interfaces, towards byte-based. Update the gluster driver accordingly. In want_zero mode, we continue to report fine-grained hole information (the caller wants as much mapping detail as possible); but when not in that mode, the caller prefers larger *pnum and merely cares about what offsets are allocated at this layer, rather than where the holes live. Since holes still read as zeroes at this layer (rather than deferring to a backing layer), we can take the shortcut of skipping find_allocation(), and merely state that all bytes are allocated. We can also drop redundant bounds checks that are already guaranteed by the block layer. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
a290f08590
commit
08c9e7735e
|
@ -1362,68 +1362,66 @@ exit:
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns the allocation status of the specified sectors.
|
* Returns the allocation status of the specified offset.
|
||||||
*
|
*
|
||||||
* If 'sector_num' is beyond the end of the disk image the return value is 0
|
* The block layer guarantees 'offset' and 'bytes' are within bounds.
|
||||||
* and 'pnum' is set to 0.
|
|
||||||
*
|
*
|
||||||
* 'pnum' is set to the number of sectors (including and immediately following
|
* 'pnum' is set to the number of bytes (including and immediately following
|
||||||
* the specified sector) that are known to be in the same
|
* the specified offset) that are known to be in the same
|
||||||
* allocated/unallocated state.
|
* allocated/unallocated state.
|
||||||
*
|
*
|
||||||
* 'nb_sectors' is the max value 'pnum' should be set to. If nb_sectors goes
|
* 'bytes' is the max value 'pnum' should be set to.
|
||||||
* beyond the end of the disk image it will be clamped.
|
|
||||||
*
|
*
|
||||||
* (Based on raw_co_get_block_status() from file-posix.c.)
|
* (Based on raw_co_block_status() from file-posix.c.)
|
||||||
*/
|
*/
|
||||||
static int64_t coroutine_fn qemu_gluster_co_get_block_status(
|
static int coroutine_fn qemu_gluster_co_block_status(BlockDriverState *bs,
|
||||||
BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,
|
bool want_zero,
|
||||||
BlockDriverState **file)
|
int64_t offset,
|
||||||
|
int64_t bytes,
|
||||||
|
int64_t *pnum,
|
||||||
|
int64_t *map,
|
||||||
|
BlockDriverState **file)
|
||||||
{
|
{
|
||||||
BDRVGlusterState *s = bs->opaque;
|
BDRVGlusterState *s = bs->opaque;
|
||||||
off_t start, data = 0, hole = 0;
|
off_t data = 0, hole = 0;
|
||||||
int64_t total_size;
|
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
|
|
||||||
if (!s->fd) {
|
if (!s->fd) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
start = sector_num * BDRV_SECTOR_SIZE;
|
if (!want_zero) {
|
||||||
total_size = bdrv_getlength(bs);
|
*pnum = bytes;
|
||||||
if (total_size < 0) {
|
*map = offset;
|
||||||
return total_size;
|
*file = bs;
|
||||||
} else if (start >= total_size) {
|
return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID;
|
||||||
*pnum = 0;
|
|
||||||
return 0;
|
|
||||||
} else if (start + nb_sectors * BDRV_SECTOR_SIZE > total_size) {
|
|
||||||
nb_sectors = DIV_ROUND_UP(total_size - start, BDRV_SECTOR_SIZE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = find_allocation(bs, start, &data, &hole);
|
ret = find_allocation(bs, offset, &data, &hole);
|
||||||
if (ret == -ENXIO) {
|
if (ret == -ENXIO) {
|
||||||
/* Trailing hole */
|
/* Trailing hole */
|
||||||
*pnum = nb_sectors;
|
*pnum = bytes;
|
||||||
ret = BDRV_BLOCK_ZERO;
|
ret = BDRV_BLOCK_ZERO;
|
||||||
} else if (ret < 0) {
|
} else if (ret < 0) {
|
||||||
/* No info available, so pretend there are no holes */
|
/* No info available, so pretend there are no holes */
|
||||||
*pnum = nb_sectors;
|
*pnum = bytes;
|
||||||
ret = BDRV_BLOCK_DATA;
|
ret = BDRV_BLOCK_DATA;
|
||||||
} else if (data == start) {
|
} else if (data == offset) {
|
||||||
/* On a data extent, compute sectors to the end of the extent,
|
/* On a data extent, compute bytes to the end of the extent,
|
||||||
* possibly including a partial sector at EOF. */
|
* possibly including a partial sector at EOF. */
|
||||||
*pnum = MIN(nb_sectors, DIV_ROUND_UP(hole - start, BDRV_SECTOR_SIZE));
|
*pnum = MIN(bytes, hole - offset);
|
||||||
ret = BDRV_BLOCK_DATA;
|
ret = BDRV_BLOCK_DATA;
|
||||||
} else {
|
} else {
|
||||||
/* On a hole, compute sectors to the beginning of the next extent. */
|
/* On a hole, compute bytes to the beginning of the next extent. */
|
||||||
assert(hole == start);
|
assert(hole == offset);
|
||||||
*pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);
|
*pnum = MIN(bytes, data - offset);
|
||||||
ret = BDRV_BLOCK_ZERO;
|
ret = BDRV_BLOCK_ZERO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*map = offset;
|
||||||
*file = bs;
|
*file = bs;
|
||||||
|
|
||||||
return ret | BDRV_BLOCK_OFFSET_VALID | start;
|
return ret | BDRV_BLOCK_OFFSET_VALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1451,7 +1449,7 @@ static BlockDriver bdrv_gluster = {
|
||||||
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
||||||
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
||||||
#endif
|
#endif
|
||||||
.bdrv_co_get_block_status = qemu_gluster_co_get_block_status,
|
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||||
.create_opts = &qemu_gluster_create_opts,
|
.create_opts = &qemu_gluster_create_opts,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1479,7 +1477,7 @@ static BlockDriver bdrv_gluster_tcp = {
|
||||||
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
||||||
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
||||||
#endif
|
#endif
|
||||||
.bdrv_co_get_block_status = qemu_gluster_co_get_block_status,
|
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||||
.create_opts = &qemu_gluster_create_opts,
|
.create_opts = &qemu_gluster_create_opts,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1507,7 +1505,7 @@ static BlockDriver bdrv_gluster_unix = {
|
||||||
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
||||||
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
||||||
#endif
|
#endif
|
||||||
.bdrv_co_get_block_status = qemu_gluster_co_get_block_status,
|
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||||
.create_opts = &qemu_gluster_create_opts,
|
.create_opts = &qemu_gluster_create_opts,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1541,7 +1539,7 @@ static BlockDriver bdrv_gluster_rdma = {
|
||||||
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
#ifdef CONFIG_GLUSTERFS_ZEROFILL
|
||||||
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
|
||||||
#endif
|
#endif
|
||||||
.bdrv_co_get_block_status = qemu_gluster_co_get_block_status,
|
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||||
.create_opts = &qemu_gluster_create_opts,
|
.create_opts = &qemu_gluster_create_opts,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue