summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2017-03-10 11:36:39 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:07:20 +0100
commit0154269f9c122440b841e06c2c16cde10c26bf7b (patch)
tree23617db0cc98a3b4070c467b29d156fb3c29df37 /fs/nfsd
parent063c753ef78bee13265bf02df185704e8fdff1f9 (diff)
downloadlinux-stable-0154269f9c122440b841e06c2c16cde10c26bf7b.tar.gz
linux-stable-0154269f9c122440b841e06c2c16cde10c26bf7b.tar.bz2
linux-stable-0154269f9c122440b841e06c2c16cde10c26bf7b.zip
NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)
[ Upstream commit 928c6fb3a9bfd6c5b287aa3465226add551c13c0 ] Current code will return 1 if the version is supported, and -1 if it isn't. This is confusing and inconsistent with the one place where this is used. So change to return 1 if it is supported, and zero if not. i.e. an error is never returned. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfssvc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 1645b977c9c6..0b752e98d153 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -155,7 +155,8 @@ int nfsd_vers(int vers, enum vers_op change)
int nfsd_minorversion(u32 minorversion, enum vers_op change)
{
- if (minorversion > NFSD_SUPPORTED_MINOR_VERSION)
+ if (minorversion > NFSD_SUPPORTED_MINOR_VERSION &&
+ change != NFSD_AVAIL)
return -1;
switch(change) {
case NFSD_SET: