From 6da85222e5e49bcb15c4c8998f26c8dffb6a5b34 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Fri, 9 Jan 2015 15:36:42 +0000 Subject: api: versioned symbols for glfs_resolve() A minor fix not addressed in http://review.gluster.org/#/c/9143/. Needed by http://review.gluster.org/#/c/9377/5/ to resolve a merge conflict and for a sucessful compile without warnings about implicit declarations. Change-Id: I4aeb3b53887687096b69516c42a0888c6e137bf6 BUG: 1160709 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/9439 Tested-by: Gluster Build System Reviewed-by: Shyamsundar Ranganathan Reviewed-by: Niels de Vos --- api/src/glfs-fops.c | 26 +++++++++++++------------- api/src/glfs-internal.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'api/src') diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index e13f53e04c5..182317fa41a 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -91,7 +91,7 @@ pub_glfs_open (struct glfs *fs, const char *path, int flags) goto out; retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -243,7 +243,7 @@ pub_glfs_stat (struct glfs *fs, const char *path, struct stat *stat) goto out; } retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -347,7 +347,7 @@ pub_glfs_creat (struct glfs *fs, const char *path, int flags, mode_t mode) destinataion. */ retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -1267,7 +1267,7 @@ pub_glfs_access (struct glfs *fs, const char *path, int mode) goto out; } retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -1867,7 +1867,7 @@ pub_glfs_opendir (struct glfs *fs, const char *path) INIT_LIST_HEAD (&glfd->entries); retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -2280,7 +2280,7 @@ pub_glfs_statvfs (struct glfs *fs, const char *path, struct statvfs *buf) goto out; } retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -2322,7 +2322,7 @@ glfs_setattr (struct glfs *fs, const char *path, struct iatt *iatt, } retry: if (follow) - ret = priv_glfs_resolve (fs, subvol, path, &loc, &riatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &riatt, reval); else ret = glfs_lresolve (fs, subvol, path, &loc, &riatt, reval); @@ -2612,7 +2612,7 @@ glfs_getxattr_common (struct glfs *fs, const char *path, const char *name, } retry: if (follow) - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); else ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval); @@ -2752,7 +2752,7 @@ glfs_listxattr_common (struct glfs *fs, const char *path, void *value, retry: if (follow) - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); else ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval); @@ -2880,7 +2880,7 @@ glfs_setxattr_common (struct glfs *fs, const char *path, const char *name, } retry: if (follow) - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); else ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval); @@ -3001,7 +3001,7 @@ glfs_removexattr_common (struct glfs *fs, const char *path, const char *name, } retry: if (follow) - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); else ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval); @@ -3206,7 +3206,7 @@ pub_glfs_chdir (struct glfs *fs, const char *path) goto out; } retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -3309,7 +3309,7 @@ pub_glfs_realpath (struct glfs *fs, const char *path, char *resolved_path) goto out; } retry: - ret = priv_glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); ESTALE_RETRY (ret, errno, reval, &loc, retry); diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h index 684636c360b..11a9a76f68e 100644 --- a/api/src/glfs-internal.h +++ b/api/src/glfs-internal.h @@ -171,7 +171,7 @@ int glfs_mgmt_init (struct glfs *fs); void glfs_init_done (struct glfs *fs, int ret) GFAPI_PRIVATE(glfs_init_done, 3.4.0); int glfs_process_volfp (struct glfs *fs, FILE *fp); -int priv_glfs_resolve (struct glfs *fs, xlator_t *subvol, const char *path, +int glfs_resolve (struct glfs *fs, xlator_t *subvol, const char *path, loc_t *loc, struct iatt *iatt, int reval) GFAPI_PRIVATE(glfs_resolve, 3.7.0); int glfs_lresolve (struct glfs *fs, xlator_t *subvol, const char *path, loc_t *loc, -- cgit