diff options
Diffstat (limited to 'xlators/features/qemu-block/src')
| -rw-r--r-- | xlators/features/qemu-block/src/bdrv-xlator.c | 6 | ||||
| -rw-r--r-- | xlators/features/qemu-block/src/qb-coroutines.c | 12 | ||||
| -rw-r--r-- | xlators/features/qemu-block/src/qemu-block.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/xlators/features/qemu-block/src/bdrv-xlator.c b/xlators/features/qemu-block/src/bdrv-xlator.c index 1e55b5fb70b..5a14f89e5af 100644 --- a/xlators/features/qemu-block/src/bdrv-xlator.c +++ b/xlators/features/qemu-block/src/bdrv-xlator.c @@ -96,15 +96,15 @@ qemu_gluster_open (BlockDriverState *bs, QDict *options, int bdrv_flags) struct iatt buf = {0,}; uuid_t gfid; - uuid_parse(gfid_str, gfid); + gf_uuid_parse(gfid_str, gfid); loc.inode = inode_find(conf->root_inode->table, gfid); if (!loc.inode) { loc.inode = inode_new(conf->root_inode->table); - uuid_copy(loc.inode->gfid, gfid); + gf_uuid_copy(loc.inode->gfid, gfid); } - uuid_copy(loc.gfid, loc.inode->gfid); + gf_uuid_copy(loc.gfid, loc.inode->gfid); ret = syncop_lookup(FIRST_CHILD(THIS), &loc, NULL, &buf, NULL, NULL); if (ret) { diff --git a/xlators/features/qemu-block/src/qb-coroutines.c b/xlators/features/qemu-block/src/qb-coroutines.c index 974312f1268..7dee80d1d00 100644 --- a/xlators/features/qemu-block/src/qb-coroutines.c +++ b/xlators/features/qemu-block/src/qb-coroutines.c @@ -56,20 +56,20 @@ qb_format_and_resume (void *opaque) /* * See if the caller specified a backing image. */ - if (!uuid_is_null(qb_inode->backing_gfid) || qb_inode->backing_fname) { + if (!gf_uuid_is_null(qb_inode->backing_gfid) || qb_inode->backing_fname) { loc_t loc = {0,}; char gfid_str[64]; struct iatt buf; - if (!uuid_is_null(qb_inode->backing_gfid)) { + if (!gf_uuid_is_null(qb_inode->backing_gfid)) { loc.inode = inode_find(qb_conf->root_inode->table, qb_inode->backing_gfid); if (!loc.inode) { loc.inode = inode_new(qb_conf->root_inode->table); - uuid_copy(loc.inode->gfid, + gf_uuid_copy(loc.inode->gfid, qb_inode->backing_gfid); } - uuid_copy(loc.gfid, loc.inode->gfid); + gf_uuid_copy(loc.gfid, loc.inode->gfid); } else if (qb_inode->backing_fname) { loc.inode = inode_new(qb_conf->root_inode->table); loc.name = qb_inode->backing_fname; @@ -90,7 +90,7 @@ qb_format_and_resume (void *opaque) goto err; } - uuid_copy(qb_inode->backing_gfid, buf.ia_gfid); + gf_uuid_copy(qb_inode->backing_gfid, buf.ia_gfid); loc_wipe(&loc); /* @@ -100,7 +100,7 @@ qb_format_and_resume (void *opaque) * the block subsystem needs to operate on the backing image on * behalf of the clone. */ - uuid_unparse(qb_inode->backing_gfid, gfid_str); + gf_uuid_unparse(qb_inode->backing_gfid, gfid_str); snprintf(base_filename, sizeof(base_filename), "gluster://gfid:%s", gfid_str); use_base = 1; diff --git a/xlators/features/qemu-block/src/qemu-block.c b/xlators/features/qemu-block/src/qemu-block.c index 6f3d28041b9..8cc78ff165c 100644 --- a/xlators/features/qemu-block/src/qemu-block.c +++ b/xlators/features/qemu-block/src/qemu-block.c @@ -141,7 +141,7 @@ qb_format_extract (xlator_t *this, char *format, inode_t *inode) goto invalid; ret = sscanf(s, "<gfid:%[^>]s", gfid_str); if (ret == 1) { - ret = uuid_parse(gfid_str, gfid); + ret = gf_uuid_parse(gfid_str, gfid); if (ret < 0) goto invalid; } @@ -164,8 +164,8 @@ qb_format_extract (xlator_t *this, char *format, inode_t *inode) * associated with a backing image as a filename local to the parent * directory. The format processing will validate further. */ - if (!uuid_is_null(gfid)) - uuid_copy(qb_inode->backing_gfid, gfid); + if (!gf_uuid_is_null(gfid)) + gf_uuid_copy(qb_inode->backing_gfid, gfid); else if (s) qb_inode->backing_fname = gf_strdup(s); |