summaryrefslogtreecommitdiffstats
path: root/support/include
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-01-07 15:37:58 -0500
committerSteve Dickson <steved@redhat.com>2014-01-07 15:57:48 -0500
commit93648ecc10bae7ed542056abb55f4b8f10ddbbb9 (patch)
tree3c386a917846f365794c2eb5efa940a16e143cfd /support/include
parent660c8537085b3e66bff7da2953da9a98429c9635 (diff)
downloadnfs-utils-93648ecc10bae7ed542056abb55f4b8f10ddbbb9.tar.gz
nfs-utils-93648ecc10bae7ed542056abb55f4b8f10ddbbb9.tar.xz
nfs-utils-93648ecc10bae7ed542056abb55f4b8f10ddbbb9.zip
nfsd: fix minorversion-choosing interface
From: "J. Bruce Fields" <bfields@redhat.com> By unconditionally adding ?4.2 to the version string written to the kernel we make nfs-utils incompatible with pre-4.2-supporting kernels. Ditto for 4.1. This problem was introduced by 12a590f8d556c00a9502eeebaa763d906222d521 "rpc.nfsd: Allow v4.2 server support with the -V option", which also change nfsd to unconditionally pass ?4.2. Instead, just don't mention 4.1 or 4.2 unless the commandline has specifically requested that one or the other be turned on or off. Tested-by: Joakim Tjernlund <joakim.tjernlund@transmode.se> Reported-by: Joakim Tjernlund <joakim.tjernlund@transmode.se> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/include')
-rw-r--r--support/include/nfs/nfs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h
index 38db5b5..df4ad76 100644
--- a/support/include/nfs/nfs.h
+++ b/support/include/nfs/nfs.h
@@ -17,7 +17,6 @@
#define NFS4_MINMINOR 1
#define NFS4_MAXMINOR 2
-#define NFS4_VERDEFAULT 0x1 /* minor verion 1 */
struct nfs_fh_len {
int fh_size;