From de80a9153e3b681d8b83aa6164c94e2829b9cf49 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Thu, 4 May 2017 12:15:09 +0530 Subject: rpc: Remove accidental IPV6 changes They snuck in with the HALO patch (07cc8679c) Change-Id: I8ced6cbb0b49554fc9d348c453d4d5da00f981f6 BUG: 1447953 Signed-off-by: Kaushal M Reviewed-on: https://review.gluster.org/17174 Smoke: Gluster Build System Reviewed-by: Niels de Vos NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/nfs/server/src/nfs.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'xlators/nfs/server/src/nfs.c') diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 1973b95c5a5..c2c3c863b05 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -204,9 +204,6 @@ nfs_program_register_portmap_all (struct nfs_state *nfs) if (nfs->override_portnum) prog->progport = nfs->override_portnum; (void) rpcsvc_program_register_portmap (prog, prog->progport); -#ifdef IPV6_DEFAULT - (void) rpcsvc_program_register_rpcbind6 (prog, prog->progport); -#endif } return (0); @@ -342,17 +339,6 @@ nfs_init_versions (struct nfs_state *nfs, xlator_t *this) if (version->required) goto err; } -#ifdef IPV6_DEFAULT - ret = rpcsvc_program_register_rpcbind6 (prog, - prog->progport); - if (ret == -1) { - gf_msg (GF_NFS, GF_LOG_ERROR, 0, - NFS_MSG_PGM_REG_FAIL, - "Program (ipv6) %s registration failed", - prog->progname); - goto err; - } -#endif } } @@ -915,15 +901,6 @@ nfs_init_state (xlator_t *this) } } -#ifdef IPV6_DEFAULT - ret = dict_set_str (this->options, "transport.address-family", - "inet6"); - if (ret == -1) { - gf_log (GF_NFS, GF_LOG_ERROR, "dict_set_str error"); - goto free_foppool; - } -#endif - /* Right only socket support exists between nfs client and * gluster nfs, so we can set default value as socket -- cgit