summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs-fops.c10
-rw-r--r--api/src/glfs-handleops.c12
-rw-r--r--api/src/glfs-internal.h2
-rw-r--r--api/src/glfs-mgmt.c6
-rw-r--r--api/src/glfs-resolve.c24
5 files changed, 27 insertions, 27 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 94b31ef076a..9d3fa17bf40 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -330,7 +330,7 @@ pub_glfs_creat (struct glfs *fs, const char *path, int flags, mode_t mode)
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -1317,7 +1317,7 @@ pub_glfs_symlink (struct glfs *fs, const char *data, const char *path)
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -1452,7 +1452,7 @@ pub_glfs_mknod (struct glfs *fs, const char *path, mode_t mode, dev_t dev)
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -1536,7 +1536,7 @@ pub_glfs_mkdir (struct glfs *fs, const char *path, mode_t mode)
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -3537,7 +3537,7 @@ priv_glfs_process_upcall_event (struct glfs *fs, void *data)
INIT_LIST_HEAD (&u_list->upcall_list);
- uuid_copy (u_list->gfid, gfid);
+ gf_uuid_copy (u_list->gfid, gfid);
u_list->event_type = upcall_data->event_type;
u_list->flags = (uint32_t)(upcall_data->flags);
u_list->expire_time_attr = upcall_data->expire_time_attr;
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c
index d42e0354268..6c7f3ee67ed 100644
--- a/api/src/glfs-handleops.c
+++ b/api/src/glfs-handleops.c
@@ -620,7 +620,7 @@ pub_glfs_h_creat (struct glfs *fs, struct glfs_object *parent, const char *path,
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -742,7 +742,7 @@ pub_glfs_h_mkdir (struct glfs *fs, struct glfs_object *parent, const char *path,
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -834,7 +834,7 @@ pub_glfs_h_mknod (struct glfs *fs, struct glfs_object *parent, const char *path,
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -1189,7 +1189,7 @@ pub_glfs_h_create_from_handle (struct glfs *fs, unsigned char *handle, int len,
/* populate the return object */
object->inode = newinode;
- uuid_copy (object->gfid, object->inode->gfid);
+ gf_uuid_copy (object->gfid, object->inode->gfid);
out:
/* TODO: Check where the inode ref is being held? */
@@ -1315,7 +1315,7 @@ pub_glfs_h_symlink (struct glfs *fs, struct glfs_object *parent,
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
ret = -1;
@@ -1682,7 +1682,7 @@ pub_glfs_h_poll_upcall (struct glfs *fs, struct callback_arg *up_arg)
list_for_each_entry_safe (u_list, tmp,
&fs->upcall_list,
upcall_list) {
- uuid_copy (gfid, u_list->gfid);
+ gf_uuid_copy (gfid, u_list->gfid);
found = 1;
break;
}
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 2c0dfe8074e..faa53dd3225 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -82,7 +82,7 @@
#define GLFS_LOC_FILL_INODE(oinode, loc, label) do { \
loc.inode = inode_ref (oinode); \
- uuid_copy (loc.gfid, oinode->gfid); \
+ gf_uuid_copy (loc.gfid, oinode->gfid); \
ret = glfs_loc_touchup (&loc); \
if (ret != 0) { \
errno = EINVAL; \
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 94e660795db..67a3e6d6c29 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -298,7 +298,7 @@ out:
gf_log (frame->this->name, GF_LOG_DEBUG,
"Volume Id: %s", volume_id_str);
pthread_mutex_lock (&fs->mutex);
- uuid_parse (volume_id_str, fs->vol_uuid);
+ gf_uuid_parse (volume_id_str, fs->vol_uuid);
pthread_mutex_unlock (&fs->mutex);
}
@@ -333,7 +333,7 @@ pub_glfs_get_volumeid (struct glfs *fs, char *volid, size_t size)
pthread_mutex_lock (&fs->mutex);
{
/* check if the volume uuid is initialized */
- if (!uuid_is_null (fs->vol_uuid)) {
+ if (!gf_uuid_is_null (fs->vol_uuid)) {
pthread_mutex_unlock (&fs->mutex);
goto done;
}
@@ -343,7 +343,7 @@ pub_glfs_get_volumeid (struct glfs *fs, char *volid, size_t size)
/* Need to fetch volume_uuid */
glfs_get_volume_info (fs);
- if (uuid_is_null (fs->vol_uuid)) {
+ if (gf_uuid_is_null (fs->vol_uuid)) {
gf_log (THIS->name, GF_LOG_ERROR, "Unable to fetch volume UUID");
return -1;
}
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
index 0111a96799e..7bd81c5aa37 100644
--- a/api/src/glfs-resolve.c
+++ b/api/src/glfs-resolve.c
@@ -93,7 +93,7 @@ glfs_refresh_inode_safe (xlator_t *subvol, inode_t *oldinode)
if (newinode)
return newinode;
- uuid_copy (loc.gfid, oldinode->gfid);
+ gf_uuid_copy (loc.gfid, oldinode->gfid);
loc.inode = inode_new (subvol->itable);
if (!loc.inode)
return NULL;
@@ -162,7 +162,7 @@ glfs_resolve_symlink (struct glfs *fs, xlator_t *subvol, inode_t *inode,
int ret = -1;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
ret = inode_path (inode, NULL, &rpath);
if (ret < 0)
goto out;
@@ -191,7 +191,7 @@ glfs_resolve_base (struct glfs *fs, xlator_t *subvol, inode_t *inode,
char *path = NULL;
loc.inode = inode_ref (inode);
- uuid_copy (loc.gfid, inode->gfid);
+ gf_uuid_copy (loc.gfid, inode->gfid);
ret = inode_path (loc.inode, NULL, &path);
loc.path = path;
@@ -224,7 +224,7 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
loc.name = component;
loc.parent = inode_ref (parent);
- uuid_copy (loc.pargfid, parent->gfid);
+ gf_uuid_copy (loc.pargfid, parent->gfid);
/* /.. and /. should point back to /
we lookup using inode and gfid of root
@@ -247,7 +247,7 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
if (loc.inode) {
- uuid_copy (loc.gfid, loc.inode->gfid);
+ gf_uuid_copy (loc.gfid, loc.inode->gfid);
reval = 1;
if (!force_lookup) {
@@ -256,7 +256,7 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
goto found;
}
} else {
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
loc.inode = inode_new (parent->table);
if (!loc.inode) {
errno = ENOMEM;
@@ -305,7 +305,7 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
goto out;
}
- uuid_generate (gfid);
+ gf_uuid_generate (gfid);
ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
if (ret) {
@@ -458,13 +458,13 @@ priv_glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,
loc->parent = parent;
if (parent) {
- uuid_copy (loc->pargfid, parent->gfid);
+ gf_uuid_copy (loc->pargfid, parent->gfid);
loc->name = component;
}
loc->inode = inode;
if (inode) {
- uuid_copy (loc->gfid, inode->gfid);
+ gf_uuid_copy (loc->gfid, inode->gfid);
if (iatt)
*iatt = ciatt;
ret = 0;
@@ -644,7 +644,7 @@ glfs_migrate_fd_safe (struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd)
goto out;
}
- uuid_copy (loc.gfid, oldinode->gfid);
+ gf_uuid_copy (loc.gfid, oldinode->gfid);
if (IA_ISDIR (oldinode->ia_type))
@@ -757,7 +757,7 @@ __glfs_migrate_openfds (struct glfs *fs, xlator_t *subvol)
fd_t *fd = NULL;
list_for_each_entry (glfd, &fs->openfds, openfds) {
- if (uuid_is_null (glfd->fd->inode->gfid)) {
+ if (gf_uuid_is_null (glfd->fd->inode->gfid)) {
gf_log (fs->volname, GF_LOG_INFO,
"skipping openfd %p/%p in graph %s (%d)",
glfd, glfd->fd, graphid_str(subvol),
@@ -1002,7 +1002,7 @@ glfs_create_object (loc_t *loc, struct glfs_object **retobject)
}
object->inode = loc->inode;
- uuid_copy (object->gfid, object->inode->gfid);
+ gf_uuid_copy (object->gfid, object->inode->gfid);
/* we hold the reference */
loc->inode = NULL;
generated by cgit (git 2.34.1) at 2024-11-16 08:23:50 +0000