summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/nfs.c
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2010-08-10 02:41:54 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-08-10 02:44:22 -0700
commit0af39ff8d03173a7ba3df1b13476b7ed447131aa (patch)
tree2180ff57269b73aa8fee6a5802a8d5d4a169f624 /xlators/nfs/server/src/nfs.c
parentb0304d47f67aa8fa677e4898fa46b96df88c8322 (diff)
nfs, nfs/rpc: Rename functions to prevent gfrpcsvc conflict
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1274 (nfs fails to start) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1274
Diffstat (limited to 'xlators/nfs/server/src/nfs.c')
-rw-r--r--xlators/nfs/server/src/nfs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index d7d2a5fd6e2..c74691cceac 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -81,7 +81,7 @@ nfs_deinit_versions (struct list_head *versions, xlator_t *this)
version->deinit (this);
*/
if (version->program)
- rpcsvc_program_unregister (nfs->rpcsvc,
+ nfs_rpcsvc_program_unregister (nfs->rpcsvc,
*(version->program));
list_del (&version->list);
@@ -121,7 +121,7 @@ nfs_init_versions (struct nfs_state *nfs, xlator_t *this)
gf_log (GF_NFS, GF_LOG_DEBUG, "Starting program: %s",
prog->progname);
- ret = rpcsvc_program_register (nfs->rpcsvc, *prog);
+ ret = nfs_rpcsvc_program_register (nfs->rpcsvc, *prog);
if (ret == -1) {
gf_log (GF_NFS, GF_LOG_ERROR, "Program init failed");
goto err;
@@ -430,9 +430,9 @@ nfs_request_user_init (nfs_user_t *nfu, rpcsvc_request_t *req)
if ((!req) || (!nfu))
return;
- gidarr = rpcsvc_auth_unix_auxgids (req, &gids);
- nfs_user_create (nfu, rpcsvc_request_uid (req), rpcsvc_request_gid (req)
- , gidarr, gids);
+ gidarr = nfs_rpcsvc_auth_unix_auxgids (req, &gids);
+ nfs_user_create (nfu, nfs_rpcsvc_request_uid (req),
+ nfs_rpcsvc_request_gid (req), gidarr, gids);
return;
}
@@ -479,7 +479,7 @@ init (xlator_t *this) {
}
/* RPC service needs to be started before NFS versions can be inited. */
- nfs->rpcsvc = rpcsvc_init (this->ctx, this->options);
+ nfs->rpcsvc = nfs_rpcsvc_init (this->ctx, this->options);
if (!nfs->rpcsvc) {
gf_log (GF_NFS, GF_LOG_ERROR, "RPC service init failed");
goto free_nfs;