Patchwork [BUG:1743] Revert "nfs: Use only 38467 as default port instead of 3846[567]"

login
register
Submitter Shehjar Tikoo
Date 2010-11-15 11:27:46
Message ID <1289820466-17164-1-git-send-email-shehjart@gluster.com>
Download mbox | patch
Permalink /patch/5700/
State Accepted
Headers show

Comments

Shehjar Tikoo - 2010-11-15 11:27:46
From: Shehjar Tikoo <shehjart@gluster.com>

This reverts commit be5c02a81c19336a6b922b1e1f28293c90955e7f.

By default, continue to register the three original port numbers
so that an upgrade to future version from 3.1 release does not
break mount requests against portmap, which may have old port
numbers registered.

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, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h
index d8a3f33..d4d6d44 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         GF_NFS_DEFAULT_PORT
+#define GF_MOUNTV3_PORT         38465
 #define GF_MOUNTV3_IOB          (2 * GF_UNIT_KB)
 #define GF_MOUNTV3_IOBPOOL      (GF_MOUNTV3_IOB * 50)
 
-#define GF_MOUNTV1_PORT         GF_NFS_DEFAULT_PORT
+#define GF_MOUNTV1_PORT         38466
 #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 6d7ed2f..e7a023c 100644
--- a/xlators/nfs/server/src/nfs.h
+++ b/xlators/nfs/server/src/nfs.h
@@ -44,7 +44,6 @@ 
 
 #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 da7ad27..a43fdc4 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            GF_NFS_DEFAULT_PORT
+#define GF_NFS3_PORT            38467
 
 #define GF_NFS3_DEFAULT_MEMFACTOR       15
 #define GF_NFS3_IOBPOOL_MULT            GF_NFS_CONCURRENT_OPS_MULT