summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster/afr')
-rw-r--r--xlators/cluster/afr/src/afr-common.c18
-rw-r--r--xlators/cluster/afr/src/afr-dir-write.c4
-rw-r--r--xlators/cluster/afr/src/afr-lk-common.c2
-rw-r--r--xlators/cluster/afr/src/afr-open.c2
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-common.c22
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-data.c4
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-entry.c12
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-metadata.c2
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-name.c24
-rw-r--r--xlators/cluster/afr/src/afr-self-heald.c12
-rw-r--r--xlators/cluster/afr/src/afr-transaction.c2
-rw-r--r--xlators/cluster/afr/src/pump.c24
12 files changed, 64 insertions, 64 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 58c33e20d36..efe8f8bc435 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -680,7 +680,7 @@ afr_inode_refresh_subvol (call_frame_t *frame, xlator_t *this, int i,
priv = this->private;
loc.inode = inode;
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
STACK_WIND_COOKIE (frame, afr_inode_refresh_subvol_cbk,
(void *) (long) i, priv->children[i],
@@ -850,7 +850,7 @@ afr_hash_child (inode_t *inode, int32_t child_count, int hashmode)
}
if (inode) {
- uuid_copy (gfid_copy, inode->gfid);
+ gf_uuid_copy (gfid_copy, inode->gfid);
}
if (hashmode > 1 && inode->ia_type != IA_IFDIR) {
@@ -1379,7 +1379,7 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
if (read_subvol == -1 || !readable[read_subvol]) {
read_subvol = i;
- uuid_copy (read_gfid, replies[i].poststat.ia_gfid);
+ gf_uuid_copy (read_gfid, replies[i].poststat.ia_gfid);
local->op_ret = 0;
}
}
@@ -1398,7 +1398,7 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
continue;
}
- if (!uuid_compare (replies[i].poststat.ia_gfid, read_gfid))
+ if (!gf_uuid_compare (replies[i].poststat.ia_gfid, read_gfid))
continue;
can_interpret = _gf_false;
@@ -1637,7 +1637,7 @@ afr_can_start_metadata_self_heal(call_frame_t *frame, xlator_t *this)
continue;
}
- if (uuid_compare (stbuf.ia_gfid, replies[i].poststat.ia_gfid)) {
+ if (gf_uuid_compare (stbuf.ia_gfid, replies[i].poststat.ia_gfid)) {
start = _gf_false;
break;
}
@@ -1753,7 +1753,7 @@ afr_lookup_entry_heal (call_frame_t *frame, xlator_t *this)
break;
}
- if (uuid_compare (replies[i].poststat.ia_gfid,
+ if (gf_uuid_compare (replies[i].poststat.ia_gfid,
replies[first].poststat.ia_gfid)) {
need_heal = _gf_true;
break;
@@ -2004,7 +2004,7 @@ afr_discover (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr_req
allocate one for us */
local->xattr_req = dict_ref (xattr_req);
- if (uuid_is_null (loc->inode->gfid)) {
+ if (gf_uuid_is_null (loc->inode->gfid)) {
afr_discover_do (frame, this, 0);
return 0;
}
@@ -2115,7 +2115,7 @@ afr_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr_req)
void *gfid_req = NULL;
int ret = 0;
- if (!loc->parent && uuid_is_null (loc->pargfid)) {
+ if (!loc->parent && gf_uuid_is_null (loc->pargfid)) {
if (xattr_req)
dict_del (xattr_req, "gfid-req");
afr_discover (frame, this, loc, xattr_req);
@@ -2149,7 +2149,7 @@ afr_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr_req)
allocate one for us */
ret = dict_get_ptr (xattr_req, "gfid-req", &gfid_req);
if (ret == 0) {
- uuid_copy (local->cont.lookup.gfid_req, gfid_req);
+ gf_uuid_copy (local->cont.lookup.gfid_req, gfid_req);
dict_del (xattr_req, "gfid-req");
}
local->xattr_req = dict_ref (xattr_req);
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c
index 4cee1ed9bea..f7ca9108092 100644
--- a/xlators/cluster/afr/src/afr-dir-write.c
+++ b/xlators/cluster/afr/src/afr-dir-write.c
@@ -69,7 +69,7 @@ afr_build_parent_loc (loc_t *parent, loc_t *child, int32_t *op_errno)
}
parent->inode = inode_ref (child->parent);
- uuid_copy (parent->gfid, child->pargfid);
+ gf_uuid_copy (parent->gfid, child->pargfid);
ret = 0;
out:
@@ -314,7 +314,7 @@ afr_mark_new_entry_changelog (call_frame_t *frame, xlator_t *this)
goto out;
new_local->pending = changelog;
- uuid_copy (new_local->loc.gfid, local->cont.dir_fop.buf.ia_gfid);
+ gf_uuid_copy (new_local->loc.gfid, local->cont.dir_fop.buf.ia_gfid);
new_local->loc.inode = inode_ref (local->inode);
new_local->call_count = call_count;
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c
index 4b7f8b7fcc2..dc4dfbc42c0 100644
--- a/xlators/cluster/afr/src/afr-lk-common.c
+++ b/xlators/cluster/afr/src/afr-lk-common.c
@@ -65,7 +65,7 @@ afr_entry_lockee_cmp (const void *l1, const void *l2)
loc_gfid ((loc_t*)&r1->loc, gfid1);
loc_gfid ((loc_t*)&r2->loc, gfid2);
- ret = uuid_compare (gfid1, gfid2);
+ ret = gf_uuid_compare (gfid1, gfid2);
/*Entrylks with NULL basename are the 'smallest'*/
if (ret == 0) {
if (!r1->basename)
diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c
index f8ad8544e10..f1da8b05201 100644
--- a/xlators/cluster/afr/src/afr-open.c
+++ b/xlators/cluster/afr/src/afr-open.c
@@ -52,7 +52,7 @@ afr_is_fd_fixable (fd_t *fd)
return _gf_false;
else if (fd_is_anonymous (fd))
return _gf_false;
- else if (uuid_is_null (fd->inode->gfid))
+ else if (gf_uuid_is_null (fd->inode->gfid))
return _gf_false;
return _gf_true;
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 21b4c4414d9..f3d1f8b0b14 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -45,7 +45,7 @@ afr_selfheal_post_op (call_frame_t *frame, xlator_t *this, inode_t *inode,
local = frame->local;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
STACK_WIND (frame, afr_selfheal_post_op_cbk, priv->children[subvol],
priv->children[subvol]->fops->xattrop, &loc,
@@ -711,7 +711,7 @@ afr_selfheal_unlocked_lookup_on (call_frame_t *frame, inode_t *parent,
}
loc.parent = inode_ref (parent);
- uuid_copy (loc.pargfid, parent->gfid);
+ gf_uuid_copy (loc.pargfid, parent->gfid);
loc.name = name;
loc.inode = inode_ref (inode);
@@ -749,7 +749,7 @@ afr_selfheal_unlocked_discover_on (call_frame_t *frame, inode_t *inode,
}
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, gfid);
+ gf_uuid_copy (loc.gfid, gfid);
AFR_ONLIST (discover_on, frame, afr_selfheal_discover_cbk, lookup, &loc,
xattr_req);
@@ -840,7 +840,7 @@ afr_selfheal_tryinodelk (call_frame_t *frame, xlator_t *this, inode_t *inode,
struct gf_flock flock = {0, };
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
flock.l_type = F_WRLCK;
flock.l_start = off;
@@ -870,7 +870,7 @@ afr_selfheal_inodelk (call_frame_t *frame, xlator_t *this, inode_t *inode,
local = frame->local;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
flock.l_type = F_WRLCK;
flock.l_start = off;
@@ -908,7 +908,7 @@ afr_selfheal_uninodelk (call_frame_t *frame, xlator_t *this, inode_t *inode,
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
flock.l_type = F_UNLCK;
flock.l_start = off;
@@ -930,7 +930,7 @@ afr_selfheal_tryentrylk (call_frame_t *frame, xlator_t *this, inode_t *inode,
loc_t loc = {0,};
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
AFR_ONALL (frame, afr_selfheal_lock_cbk, entrylk, dom,
&loc, name, ENTRYLK_LOCK_NB, ENTRYLK_WRLCK, NULL);
@@ -954,7 +954,7 @@ afr_selfheal_entrylk (call_frame_t *frame, xlator_t *this, inode_t *inode,
local = frame->local;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
AFR_ONALL (frame, afr_selfheal_lock_cbk, entrylk, dom, &loc,
name, ENTRYLK_LOCK_NB, ENTRYLK_WRLCK, NULL);
@@ -985,7 +985,7 @@ afr_selfheal_unentrylk (call_frame_t *frame, xlator_t *this, inode_t *inode,
loc_t loc = {0,};
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
AFR_ONLIST (locked_on, frame, afr_selfheal_lock_cbk, entrylk,
dom, &loc, name, ENTRYLK_UNLOCK, ENTRYLK_WRLCK, NULL);
@@ -1225,7 +1225,7 @@ afr_inode_find (xlator_t *this, uuid_t gfid)
if (!inode)
return NULL;
- uuid_copy (inode->gfid, gfid);
+ gf_uuid_copy (inode->gfid, gfid);
return inode;
}
@@ -1271,7 +1271,7 @@ afr_selfheal_newentry_mark (call_frame_t *frame, xlator_t *this, inode_t *inode,
priv = this->private;
- uuid_copy (inode->gfid, replies[source].poststat.ia_gfid);
+ gf_uuid_copy (inode->gfid, replies[source].poststat.ia_gfid);
xattr = dict_new();
if (!xattr)
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index c0f444a776e..d20b6945a7e 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -296,7 +296,7 @@ afr_selfheal_data_restore_time (call_frame_t *frame, xlator_t *this,
loc_t loc = {0, };
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
AFR_ONLIST (healed_sinks, frame, attr_cbk, setattr, &loc,
&replies[source].poststat,
@@ -748,7 +748,7 @@ afr_selfheal_data_open (xlator_t *this, inode_t *inode)
return NULL;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
ret = syncop_open (this, &loc, O_RDWR|O_LARGEFILE, fd);
if (ret) {
diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c
index 13825e1ebad..1f3ea38ffd9 100644
--- a/xlators/cluster/afr/src/afr-self-heal-entry.c
+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c
@@ -44,7 +44,7 @@ afr_selfheal_entry_delete (xlator_t *this, inode_t *dir, const char *name,
subvol = priv->children[child];
loc.parent = inode_ref (dir);
- uuid_copy (loc.pargfid, dir->gfid);
+ gf_uuid_copy (loc.pargfid, dir->gfid);
loc.name = name;
loc.inode = inode_ref (inode);
@@ -97,7 +97,7 @@ afr_selfheal_recreate_entry (xlator_t *this, int dst, int source, inode_t *dir,
return -ENOMEM;
loc.parent = inode_ref (dir);
- uuid_copy (loc.pargfid, dir->gfid);
+ gf_uuid_copy (loc.pargfid, dir->gfid);
loc.name = name;
loc.inode = inode_ref (inode);
@@ -113,7 +113,7 @@ afr_selfheal_recreate_entry (xlator_t *this, int dst, int source, inode_t *dir,
iatt = &replies[source].poststat;
srcloc.inode = inode_ref (inode);
- uuid_copy (srcloc.gfid, iatt->ia_gfid);
+ gf_uuid_copy (srcloc.gfid, iatt->ia_gfid);
mode = st_mode_from_ia (iatt->ia_prot, iatt->ia_type);
@@ -186,7 +186,7 @@ __afr_selfheal_heal_dirent (call_frame_t *frame, xlator_t *this, fd_t *fd,
ret = afr_selfheal_entry_delete (this, fd->inode, name,
inode, i, replies);
} else {
- if (!uuid_compare (replies[i].poststat.ia_gfid,
+ if (!gf_uuid_compare (replies[i].poststat.ia_gfid,
replies[source].poststat.ia_gfid))
continue;
@@ -227,7 +227,7 @@ afr_selfheal_detect_gfid_and_type_mismatch (xlator_t *this,
if (replies[i].op_ret != 0)
continue;
- if (uuid_compare (replies[src_idx].poststat.ia_gfid,
+ if (gf_uuid_compare (replies[src_idx].poststat.ia_gfid,
replies[i].poststat.ia_gfid)) {
gf_log (this->name, GF_LOG_ERROR, "Gfid mismatch "
"detected for <%s/%s>, %s on %s and %s on %s. "
@@ -680,7 +680,7 @@ afr_selfheal_data_opendir (xlator_t *this, inode_t *inode)
return NULL;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
ret = syncop_opendir (this, &loc, fd);
if (ret) {
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index b08bd4ebe34..3d76647e974 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -49,7 +49,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
priv = this->private;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
gf_log (this->name, GF_LOG_INFO, "performing metadata selfheal on %s",
uuid_utoa (inode->gfid));
diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c
index af635f06d52..12163298f7e 100644
--- a/xlators/cluster/afr/src/afr-self-heal-name.c
+++ b/xlators/cluster/afr/src/afr-self-heal-name.c
@@ -43,7 +43,7 @@ __afr_selfheal_assign_gfid (xlator_t *this, inode_t *parent, uuid_t pargfid,
new_local = new_frame->local;
- uuid_copy (parent->gfid, pargfid);
+ gf_uuid_copy (parent->gfid, pargfid);
xdata = dict_new ();
if (!xdata) {
@@ -59,7 +59,7 @@ __afr_selfheal_assign_gfid (xlator_t *this, inode_t *parent, uuid_t pargfid,
loc.parent = inode_ref (parent);
loc.inode = inode_ref (inode);
- uuid_copy (loc.pargfid, pargfid);
+ gf_uuid_copy (loc.pargfid, pargfid);
loc.name = bname;
if (is_gfid_absent) {
@@ -121,13 +121,13 @@ __afr_selfheal_name_impunge (call_frame_t *frame, xlator_t *this,
newentry = alloca0 (priv->child_count);
sources = alloca0 (priv->child_count);
- uuid_copy (parent->gfid, pargfid);
+ gf_uuid_copy (parent->gfid, pargfid);
for (i = 0; i < priv->child_count; i++) {
if (!replies[i].valid)
continue;
- if (uuid_compare (replies[i].poststat.ia_gfid,
+ if (gf_uuid_compare (replies[i].poststat.ia_gfid,
replies[gfid_idx].poststat.ia_gfid) == 0) {
sources[i] = 1;
continue;
@@ -159,7 +159,7 @@ __afr_selfheal_name_expunge (xlator_t *this, inode_t *parent, uuid_t pargfid,
priv = this->private;
loc.parent = inode_ref (parent);
- uuid_copy (loc.pargfid, pargfid);
+ gf_uuid_copy (loc.pargfid, pargfid);
loc.name = bname;
loc.inode = inode_ref (inode);
@@ -216,7 +216,7 @@ afr_selfheal_gfid_idx_get (xlator_t *this, struct afr_reply *replies,
if (!sources[i])
continue;
- if (uuid_is_null (replies[i].poststat.ia_gfid))
+ if (gf_uuid_is_null (replies[i].poststat.ia_gfid))
continue;
gfid_idx = i;
@@ -251,12 +251,12 @@ afr_selfheal_name_need_heal_check (xlator_t *this, struct afr_reply *replies)
if (replies[i].op_ret != replies[first_idx].op_ret)
need_heal = _gf_true;
- if (uuid_compare (replies[i].poststat.ia_gfid,
+ if (gf_uuid_compare (replies[i].poststat.ia_gfid,
replies[first_idx].poststat.ia_gfid))
need_heal = _gf_true;
if ((replies[i].op_ret == 0) &&
- (uuid_is_null(replies[i].poststat.ia_gfid)))
+ (gf_uuid_is_null(replies[i].poststat.ia_gfid)))
need_heal = _gf_true;
}
@@ -328,7 +328,7 @@ afr_selfheal_name_gfid_mismatch_check (xlator_t *this, struct afr_reply *replies
if (!replies[i].valid)
continue;
- if (uuid_is_null (replies[i].poststat.ia_gfid))
+ if (gf_uuid_is_null (replies[i].poststat.ia_gfid))
continue;
if (!gfid) {
@@ -339,7 +339,7 @@ afr_selfheal_name_gfid_mismatch_check (xlator_t *this, struct afr_reply *replies
if (sources[i] || source == -1) {
if ((sources[gfid_idx_iter] || source == -1) &&
- uuid_compare (gfid, replies[i].poststat.ia_gfid)) {
+ gf_uuid_compare (gfid, replies[i].poststat.ia_gfid)) {
gf_msg (this->name, GF_LOG_WARNING, 0,
AFR_MSG_SPLIT_BRAIN,
"GFID mismatch for <gfid:%s>/%s "
@@ -428,7 +428,7 @@ __afr_selfheal_name_do (call_frame_t *frame, xlator_t *this, inode_t *parent,
return ret;
if (gfid_idx == -1) {
- if (!gfid_req || uuid_is_null (gfid_req))
+ if (!gfid_req || gf_uuid_is_null (gfid_req))
return -1;
gfid = gfid_req;
} else {
@@ -654,7 +654,7 @@ afr_selfheal_name_unlocked_inspect (call_frame_t *frame, xlator_t *this,
if (replies[i].op_ret != replies[first_idx].op_ret)
*need_heal = _gf_true;
- if (uuid_compare (replies[i].poststat.ia_gfid,
+ if (gf_uuid_compare (replies[i].poststat.ia_gfid,
replies[first_idx].poststat.ia_gfid))
*need_heal = _gf_true;
}
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index c38440b4c9b..177e92497fe 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -82,7 +82,7 @@ afr_shd_is_subvol_local (xlator_t *this, int subvol)
loc_t loc = {0, };
loc.inode = this->itable->root;
- uuid_copy (loc.gfid, loc.inode->gfid);
+ gf_uuid_copy (loc.gfid, loc.inode->gfid);
priv = this->private;
syncop_is_subvol_local(priv->children[subvol], &loc, &is_local);
return is_local;
@@ -171,7 +171,7 @@ afr_shd_inode_find (xlator_t *this, xlator_t *subvol, uuid_t gfid)
loc.inode = inode_new (this->itable);
if (!loc.inode)
goto out;
- uuid_copy (loc.gfid, gfid);
+ gf_uuid_copy (loc.gfid, gfid);
ret = syncop_lookup (subvol, &loc, NULL, &iatt, NULL, NULL);
if (ret < 0)
@@ -196,7 +196,7 @@ afr_shd_index_inode (xlator_t *this, xlator_t *subvol)
void *index_gfid = NULL;
rootloc.inode = inode_ref (this->itable->root);
- uuid_copy (rootloc.gfid, rootloc.inode->gfid);
+ gf_uuid_copy (rootloc.gfid, rootloc.inode->gfid);
ret = syncop_getxattr (subvol, &rootloc, &xattr,
GF_XATTROP_INDEX_GFID, NULL);
@@ -408,7 +408,7 @@ afr_shd_index_heal (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
gf_log (healer->this->name, GF_LOG_DEBUG, "got entry: %s",
entry->d_name);
- ret = uuid_parse (entry->d_name, gfid);
+ ret = gf_uuid_parse (entry->d_name, gfid);
if (ret)
return 0;
@@ -847,7 +847,7 @@ afr_shd_gather_entry (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
gf_log (this->name, GF_LOG_DEBUG, "got entry: %s",
entry->d_name);
- ret = uuid_parse (entry->d_name, gfid);
+ ret = gf_uuid_parse (entry->d_name, gfid);
if (ret)
return 0;
@@ -1035,7 +1035,7 @@ afr_shd_get_index_count (xlator_t *this, int i, uint64_t *count)
subvol = priv->children[i];
rootloc.inode = inode_ref (this->itable->root);
- uuid_copy (rootloc.gfid, rootloc.inode->gfid);
+ gf_uuid_copy (rootloc.gfid, rootloc.inode->gfid);
ret = syncop_getxattr (subvol, &rootloc, &xattr,
GF_XATTROP_INDEX_COUNT, NULL);
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index afa11bba7ab..d2111060035 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -548,7 +548,7 @@ afr_handle_quorum (call_frame_t *frame)
return;
if (local->fd) {
- uuid_copy (gfid, local->fd->inode->gfid);
+ gf_uuid_copy (gfid, local->fd->inode->gfid);
file = uuid_utoa (gfid);
} else {
loc_path (&local->loc, local->loc.name);
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 70038b9406e..139c9b6c447 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -38,7 +38,7 @@ afr_set_dict_gfid (dict_t *dict, uuid_t gfid)
goto out;
}
- uuid_copy (*pgfid, gfid);
+ gf_uuid_copy (*pgfid, gfid);
ret = dict_set_dynptr (dict, "gfid-req", pgfid, sizeof (uuid_t));
if (ret)
@@ -73,12 +73,12 @@ afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name)
if (!child)
goto out;
- if (!uuid_is_null (parent->inode->gfid))
- uuid_copy (pargfid, parent->inode->gfid);
- else if (!uuid_is_null (parent->gfid))
- uuid_copy (pargfid, parent->gfid);
+ if (!gf_uuid_is_null (parent->inode->gfid))
+ gf_uuid_copy (pargfid, parent->inode->gfid);
+ else if (!gf_uuid_is_null (parent->gfid))
+ gf_uuid_copy (pargfid, parent->gfid);
- if (uuid_is_null (pargfid))
+ if (gf_uuid_is_null (pargfid))
goto out;
if (strcmp (parent->path, "/") == 0)
@@ -98,7 +98,7 @@ afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name)
child->parent = inode_ref (parent->inode);
child->inode = inode_new (parent->inode->table);
- uuid_copy (child->pargfid, pargfid);
+ gf_uuid_copy (child->pargfid, pargfid);
if (!child->inode) {
ret = -1;
@@ -122,7 +122,7 @@ afr_build_root_loc (xlator_t *this, loc_t *loc)
loc->path = gf_strdup ("/");
loc->name = "";
loc->inode = inode_ref (priv->root_inode);
- uuid_copy (loc->gfid, loc->inode->gfid);
+ gf_uuid_copy (loc->gfid, loc->inode->gfid);
}
static void
@@ -131,9 +131,9 @@ afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent)
GF_ASSERT (loc);
GF_ASSERT (buf);
- uuid_copy (loc->gfid, buf->ia_gfid);
+ gf_uuid_copy (loc->gfid, buf->ia_gfid);
if (postparent)
- uuid_copy (loc->pargfid, postparent->ia_gfid);
+ gf_uuid_copy (loc->pargfid, postparent->ia_gfid);
}
static uint64_t pump_pid = 0;
@@ -141,7 +141,7 @@ static inline void
pump_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent)
{
afr_update_loc_gfids (loc, iatt, parent);
- uuid_copy (loc->inode->gfid, iatt->ia_gfid);
+ gf_uuid_copy (loc->inode->gfid, iatt->ia_gfid);
}
static int
@@ -489,7 +489,7 @@ gf_pump_traverse_directory (loc_t *loc)
"found readdir entry=%s", entry->d_name);
offset = entry->d_off;
- if (uuid_is_null (entry->d_stat.ia_gfid)) {
+ if (gf_uuid_is_null (entry->d_stat.ia_gfid)) {
gf_log (this->name, GF_LOG_WARNING, "%s/%s: No "
"gfid present skipping",
loc->path, entry->d_name);
generated by cgit (git 2.34.1) at 2024-11-16 12:15:47 +0000