Patchwork [BUG:1743,2/3] nfs: Use only 38467 as default port instead of 3846[567]

login
register
Submitter Shehjar Tikoo
Date 2010-11-08 11:55:17
Message ID <1289217318-1872-2-git-send-email-shehjart@gluster.com>
Download mbox | patch
Permalink /patch/5651/
State Accepted
Headers show

Comments

Shehjar Tikoo - 2010-11-08 11:55:17
From: Shehjar Tikoo <shehjart@gluster.com>


Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
---
 xlators/nfs/server/src/mount3.h |    4 ++--
 xlators/nfs/server/src/nfs.h    |    1 +
 xlators/nfs/server/src/nfs3.h   |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h
index d4d6d44..d8a3f33 100644
--- a/xlators/nfs/server/src/mount3.h
+++ b/xlators/nfs/server/src/mount3.h
@@ -37,11 +37,11 @@ 
 #include "uuid.h"
 
 /* Registered with portmap */
-#define GF_MOUNTV3_PORT         38465
+#define GF_MOUNTV3_PORT         GF_NFS_DEFAULT_PORT
 #define GF_MOUNTV3_IOB          (2 * GF_UNIT_KB)
 #define GF_MOUNTV3_IOBPOOL      (GF_MOUNTV3_IOB * 50)
 
-#define GF_MOUNTV1_PORT         38466
+#define GF_MOUNTV1_PORT         GF_NFS_DEFAULT_PORT
 #define GF_MNT                  GF_NFS"-mount"
 
 extern rpcsvc_program_t *
diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h
index b6a1d4a..8cbcf63 100644
--- a/xlators/nfs/server/src/nfs.h
+++ b/xlators/nfs/server/src/nfs.h
@@ -44,6 +44,7 @@ 
 
 #define GF_NFS_DVM_ON                   1
 #define GF_NFS_DVM_OFF                  2
+#define GF_NFS_DEFAULT_PORT             38467
 
 /* Callback into a version-specific NFS protocol.
  * The return type is used by the nfs.c code to register the protocol.
diff --git a/xlators/nfs/server/src/nfs3.h b/xlators/nfs/server/src/nfs3.h
index a43fdc4..da7ad27 100644
--- a/xlators/nfs/server/src/nfs3.h
+++ b/xlators/nfs/server/src/nfs3.h
@@ -38,7 +38,7 @@ 
 #include <sys/statvfs.h>
 
 #define GF_NFS3                 GF_NFS"-nfsv3"
-#define GF_NFS3_PORT            38467
+#define GF_NFS3_PORT            GF_NFS_DEFAULT_PORT
 
 #define GF_NFS3_DEFAULT_MEMFACTOR       15
 #define GF_NFS3_IOBPOOL_MULT            GF_NFS_CONCURRENT_OPS_MULT