summaryrefslogtreecommitdiffstats
path: root/xlators/mount/fuse/src/fuse-resolve.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mount/fuse/src/fuse-resolve.c')
-rw-r--r--xlators/mount/fuse/src/fuse-resolve.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c
index 5aaa32ea660..2ddb31cd076 100644
--- a/xlators/mount/fuse/src/fuse-resolve.c
+++ b/xlators/mount/fuse/src/fuse-resolve.c
@@ -93,7 +93,7 @@ fuse_resolve_entry (fuse_state_t *state)
resolve_loc = &resolve->resolve_loc;
resolve_loc->parent = inode_ref (state->loc_now->parent);
- uuid_copy (resolve_loc->pargfid, state->loc_now->pargfid);
+ gf_uuid_copy (resolve_loc->pargfid, state->loc_now->pargfid);
resolve_loc->name = resolve->bname;
resolve_loc->inode = inode_new (state->itable);
@@ -137,7 +137,7 @@ fuse_resolve_gfid_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
* -2: entry (inode corresponding to path) could not be resolved
*/
- if (uuid_is_null (resolve->gfid)) {
+ if (gf_uuid_is_null (resolve->gfid)) {
resolve->op_ret = -1;
} else {
resolve->op_ret = -2;
@@ -154,13 +154,13 @@ fuse_resolve_gfid_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
if (!link_inode)
goto out;
- if (!uuid_is_null (resolve->gfid)) {
+ if (!gf_uuid_is_null (resolve->gfid)) {
loc_now->inode = link_inode;
goto out;
}
loc_now->parent = link_inode;
- uuid_copy (loc_now->pargfid, link_inode->gfid);
+ gf_uuid_copy (loc_now->pargfid, link_inode->gfid);
fuse_resolve_entry (state);
@@ -181,10 +181,10 @@ fuse_resolve_gfid (fuse_state_t *state)
resolve = state->resolve_now;
resolve_loc = &resolve->resolve_loc;
- if (!uuid_is_null (resolve->pargfid)) {
- uuid_copy (resolve_loc->gfid, resolve->pargfid);
- } else if (!uuid_is_null (resolve->gfid)) {
- uuid_copy (resolve_loc->gfid, resolve->gfid);
+ if (!gf_uuid_is_null (resolve->pargfid)) {
+ gf_uuid_copy (resolve_loc->gfid, resolve->pargfid);
+ } else if (!gf_uuid_is_null (resolve->gfid)) {
+ gf_uuid_copy (resolve_loc->gfid, resolve->gfid);
}
/* inode may already exist in case we are looking up an inode which was
@@ -234,7 +234,7 @@ fuse_resolve_parent_simple (fuse_state_t *state)
/* no graph switches since */
loc->parent = inode_ref (parent);
- uuid_copy (loc->pargfid, parent->gfid);
+ gf_uuid_copy (loc->pargfid, parent->gfid);
loc->inode = inode_grep (state->itable, parent, loc->name);
/* nodeid for root is 1 and we blindly take the latest graph's
@@ -264,7 +264,7 @@ fuse_resolve_parent_simple (fuse_state_t *state)
}
loc->parent = parent;
- uuid_copy (loc->pargfid, resolve->pargfid);
+ gf_uuid_copy (loc->pargfid, resolve->pargfid);
inode = inode_grep (state->itable, parent, loc->name);
if (inode) {
@@ -555,7 +555,7 @@ fuse_gfid_set (fuse_state_t *state)
{
int ret = 0;
- if (uuid_is_null (state->gfid))
+ if (gf_uuid_is_null (state->gfid))
goto out;
if (!state->xdata)
@@ -580,7 +580,7 @@ fuse_resolve_entry_init (fuse_state_t *state, fuse_resolve_t *resolve,
inode_t *parent = NULL;
parent = fuse_ino_to_inode (par, state->this);
- uuid_copy (resolve->pargfid, parent->gfid);
+ gf_uuid_copy (resolve->pargfid, parent->gfid);
resolve->parhint = parent;
resolve->bname = gf_strdup (name);
@@ -595,7 +595,7 @@ fuse_resolve_inode_init (fuse_state_t *state, fuse_resolve_t *resolve,
inode_t *inode = NULL;
inode = fuse_ino_to_inode (ino, state->this);
- uuid_copy (resolve->gfid, inode->gfid);
+ gf_uuid_copy (resolve->gfid, inode->gfid);
resolve->hint = inode;
return 0;
@@ -623,11 +623,11 @@ fuse_resolve (fuse_state_t *state)
fuse_resolve_fd (state);
- } else if (!uuid_is_null (resolve->pargfid)) {
+ } else if (!gf_uuid_is_null (resolve->pargfid)) {
fuse_resolve_parent (state);
- } else if (!uuid_is_null (resolve->gfid)) {
+ } else if (!gf_uuid_is_null (resolve->gfid)) {
fuse_resolve_inode (state);