From a25cdf135f01ebeb64a4497df1bb5146bfdc6620 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 13 Jun 2014 11:45:53 +0530 Subject: Use common loc-touchup in fuse/server/gfapi Change-Id: Id41fb29480bb6d22c34469339163da05b98c1a98 BUG: 1115907 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/8226 Reviewed-by: Shyamsundar Ranganathan Tested-by: Gluster Build System Reviewed-by: Niels de Vos Reviewed-by: Vijay Bellur --- api/src/glfs-resolve.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'api/src') diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index 9aeac57b75e..3c69d78e487 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -139,30 +139,15 @@ __glfs_refresh_inode (struct glfs *fs, xlator_t *subvol, inode_t *inode) int priv_glfs_loc_touchup (loc_t *loc) { - char *path = NULL; - int ret = -1; - char *bn = NULL; + int ret = 0; - if (loc->parent) - ret = inode_path (loc->parent, loc->name, &path); - else - ret = inode_path (loc->inode, 0, &path); - - loc->path = path; - - if (ret < 0 || !path) { - ret = -1; - errno = ENOMEM; - goto out; - } + ret = loc_touchup (loc, loc->name); + if (ret < 0) { + errno = -ret; + ret = -1; + } - bn = strrchr (path, '/'); - if (bn) - bn++; - loc->name = bn; - ret = 0; -out: - return ret; + return ret; } GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_loc_touchup, 3.4.0); -- cgit