[sheepdog] [Qemu-devel] [PATCH 5/7] sheepdog: Make sd_prealloc() take a BDS
Eric Blake
eblake at redhat.com
Tue Feb 13 16:02:40 CET 2018
On 02/13/2018 07:03 AM, Max Reitz wrote:
> We want to use this function in sd_truncate() later on, so taking a
> filename is not exactly ideal.
>
> Signed-off-by: Max Reitz <mreitz at redhat.com>
> ---
> block/sheepdog.c | 29 +++++++++++++++++++++--------
> 1 file changed, 21 insertions(+), 8 deletions(-)
>
> @@ -1837,10 +1837,11 @@ static int sd_prealloc(const char *filename, Error **errp)
> void *buf = NULL;
> int ret;
>
> - blk = blk_new_open(filename, NULL, NULL,
> - BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
> - if (blk == NULL) {
> - ret = -EIO;
> + blk = blk_new(BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE | BLK_PERM_RESIZE,
> + BLK_PERM_ALL);
> +
> + ret = blk_insert_bs(blk, bs, errp);
> + if (ret < 0) {
> if (prealloc) {
> - ret = sd_prealloc(filename, errp);
> + BlockDriverState *bs;
> + QDict *opts;
> +
> + opts = qdict_new();
> + qdict_put_str(opts, "driver", "sheepdog");
> + bs = bdrv_open(filename, NULL, opts, BDRV_O_PROTOCOL | BDRV_O_RDWR,
> + errp);
I'm a bit weak on ensuring the same ending flags result after the new
bdrv_open()/blk_new() as what you used to get on blk_new_open(), so
someone that can actually test this is appreciated.
Reviewed-by: Eric Blake <eblake at redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
More information about the sheepdog
mailing list