diff options
Diffstat (limited to 'api/src/glfs-handleops.c')
| -rw-r--r-- | api/src/glfs-handleops.c | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 2ee3820ed79..6d594241a1d 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -80,7 +80,7 @@ pub_glfs_h_lookupat (struct glfs *fs, struct glfs_object *parent, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { errno = EIO; goto out; @@ -96,7 +96,7 @@ pub_glfs_h_lookupat (struct glfs *fs, struct glfs_object *parent, } /* fop/op */ - ret = priv_glfs_resolve_at (fs, subvol, inode, path, &loc, &iatt, + ret = glfs_resolve_at (fs, subvol, inode, path, &loc, &iatt, 0 /*TODO: links? */, 0); /* populate out args */ @@ -113,7 +113,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -139,7 +139,7 @@ pub_glfs_h_stat (struct glfs *fs, struct glfs_object *object, struct stat *stat) __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -170,7 +170,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -196,7 +196,7 @@ pub_glfs_h_getattrs (struct glfs *fs, struct glfs_object *object, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -222,7 +222,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -249,7 +249,7 @@ pub_glfs_h_getxattrs (struct glfs *fs, struct glfs_object *object, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -284,7 +284,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -311,7 +311,7 @@ pub_glfs_h_setattrs (struct glfs *fs, struct glfs_object *object, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -340,7 +340,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -369,7 +369,7 @@ pub_glfs_h_setxattrs (struct glfs *fs, struct glfs_object *object, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -406,7 +406,7 @@ out: if (xattr) dict_unref (xattr); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -432,7 +432,7 @@ pub_glfs_h_removexattrs (struct glfs *fs, struct glfs_object *object, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -459,7 +459,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -485,7 +485,7 @@ pub_glfs_h_open (struct glfs *fs, struct glfs_object *object, int flags) __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { errno = EIO; goto out; @@ -546,7 +546,7 @@ out: glfs_fd_bind (glfd); } - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return glfd; } @@ -577,7 +577,7 @@ pub_glfs_h_creat (struct glfs *fs, struct glfs_object *parent, const char *path, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -661,7 +661,7 @@ out: glfd = NULL; } - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -691,7 +691,7 @@ pub_glfs_h_mkdir (struct glfs *fs, struct glfs_object *parent, const char *path, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -753,7 +753,7 @@ out: if (xattr_req) dict_unref (xattr_req); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -783,7 +783,7 @@ pub_glfs_h_mknod (struct glfs *fs, struct glfs_object *parent, const char *path, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -844,7 +844,7 @@ out: if (xattr_req) dict_unref (xattr_req); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -869,7 +869,7 @@ pub_glfs_h_unlink (struct glfs *fs, struct glfs_object *parent, const char *path __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if ( !subvol ) { ret = -1; errno = EIO; @@ -883,7 +883,7 @@ pub_glfs_h_unlink (struct glfs *fs, struct glfs_object *parent, const char *path goto out; } - ret = priv_glfs_resolve_at (fs, subvol, inode, path, &loc, NULL, 0 , 0); + ret = glfs_resolve_at (fs, subvol, inode, path, &loc, NULL, 0 , 0); if (ret != 0) { goto out; } @@ -911,7 +911,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -937,7 +937,7 @@ pub_glfs_h_opendir (struct glfs *fs, struct glfs_object *object) __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -990,7 +990,7 @@ out: glfs_fd_bind (glfd); } - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return glfd; } @@ -1015,7 +1015,7 @@ pub_glfs_h_access (struct glfs *fs, struct glfs_object *object, int mask) __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -1044,7 +1044,7 @@ out: inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -1106,7 +1106,7 @@ pub_glfs_h_create_from_handle (struct glfs *fs, unsigned char *handle, int len, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { errno = EIO; goto out; @@ -1165,7 +1165,7 @@ out: /* TODO: Check where the inode ref is being held? */ loc_wipe (&loc); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -1203,7 +1203,7 @@ pub_glfs_h_truncate (struct glfs *fs, struct glfs_object *object, off_t offset) __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -1233,7 +1233,7 @@ out: if (inode) inode_unref (inode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -1264,7 +1264,7 @@ pub_glfs_h_symlink (struct glfs *fs, struct glfs_object *parent, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -1331,7 +1331,7 @@ out: if (xattr_req) dict_unref (xattr_req); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return object; } @@ -1358,7 +1358,7 @@ pub_glfs_h_readlink (struct glfs *fs, struct glfs_object *object, char *buf, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -1391,7 +1391,7 @@ out: if (linkval) GF_FREE (linkval); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -1399,9 +1399,6 @@ out: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_h_readlink, 3.4.2); -extern int -priv_glfs_loc_touchup (loc_t *); - int pub_glfs_h_link (struct glfs *fs, struct glfs_object *linksrc, struct glfs_object *parent, const char *name) @@ -1423,7 +1420,7 @@ pub_glfs_h_link (struct glfs *fs, struct glfs_object *linksrc, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if (!subvol) { ret = -1; errno = EIO; @@ -1455,7 +1452,7 @@ pub_glfs_h_link (struct glfs *fs, struct glfs_object *linksrc, /* setup newloc based on parent */ newloc.parent = inode_ref (pinode); newloc.name = name; - ret = priv_glfs_loc_touchup (&newloc); + ret = glfs_loc_touchup (&newloc); if (ret != 0) { errno = EINVAL; goto out; @@ -1483,7 +1480,7 @@ out: if (pinode) inode_unref (pinode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } @@ -1515,7 +1512,7 @@ pub_glfs_h_rename (struct glfs *fs, struct glfs_object *olddir, __glfs_entry_fs (fs); /* get the active volume */ - subvol = priv_glfs_active_subvol (fs); + subvol = glfs_active_subvol (fs); if ( !subvol ) { ret = -1; errno = EIO; @@ -1529,7 +1526,7 @@ pub_glfs_h_rename (struct glfs *fs, struct glfs_object *olddir, goto out; } - ret = priv_glfs_resolve_at (fs, subvol, oldpinode, oldname, &oldloc, + ret = glfs_resolve_at (fs, subvol, oldpinode, oldname, &oldloc, &oldiatt, 0 , 0); if (ret != 0) { goto out; @@ -1542,7 +1539,7 @@ pub_glfs_h_rename (struct glfs *fs, struct glfs_object *olddir, goto out; } - ret = priv_glfs_resolve_at (fs, subvol, newpinode, newname, &newloc, + ret = glfs_resolve_at (fs, subvol, newpinode, newname, &newloc, &newiatt, 0, 0); if (ret && errno != ENOENT && newloc.parent) @@ -1580,7 +1577,7 @@ out: if (newpinode) inode_unref (newpinode); - priv_glfs_subvol_done (fs, subvol); + glfs_subvol_done (fs, subvol); return ret; } |