diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-11-15 05:57:46 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-11-15 04:03:55 -0800 |
| commit | 553c15160e4e3b063f4b689ee762b6d14be9953b (patch) | |
| tree | c4395c5a289104551487292ad1f2351787023c74 | |
| parent | 78654d270cde028c5d7f9da29b2790b90c19e11f (diff) | |
Revert "nfs: Use only 38467 as default port instead of 3846[567]"
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>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1743 (XenServer is not compatible with GlusterNFS)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1743
| -rw-r--r-- | xlators/nfs/server/src/mount3.h | 4 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs.h | 1 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index d8a3f33a7..d4d6d446f 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 6d7ed2f04..e7a023c4a 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 da7ad27b7..a43fdc4af 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 |