diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-01-07 15:37:58 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-01-07 15:57:48 -0500 |
| commit | 93648ecc10bae7ed542056abb55f4b8f10ddbbb9 (patch) | |
| tree | 3c386a917846f365794c2eb5efa940a16e143cfd /utils/nfsd/nfssvc.h | |
| parent | 660c8537085b3e66bff7da2953da9a98429c9635 (diff) | |
| download | nfs-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 'utils/nfsd/nfssvc.h')
| -rw-r--r-- | utils/nfsd/nfssvc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/nfsd/nfssvc.h b/utils/nfsd/nfssvc.h index 08de0fe..2bbd3d3 100644 --- a/utils/nfsd/nfssvc.h +++ b/utils/nfsd/nfssvc.h @@ -24,5 +24,5 @@ void nfssvc_mount_nfsdfs(char *progname); int nfssvc_inuse(void); int nfssvc_set_sockets(const int family, const unsigned int protobits, const char *host, const char *port); -void nfssvc_setvers(unsigned int ctlbits, int minorvers4); +void nfssvc_setvers(unsigned int ctlbits, int minorvers4[]); int nfssvc_threads(unsigned short port, int nrservs); |