Patch "NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)" has been added to the 4.9-stable tree

Patch "NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nfsd-fix-nfsd_minorversion-..-nfsd_avail.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Mon Dec 18 14:12:34 CET 2017
From: NeilBrown <neilb@suse.com>
Date: Fri, 10 Mar 2017 11:36:39 +1100
Subject: NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)

From: NeilBrown <neilb@suse.com>


[ 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>
---
 fs/nfsd/nfssvc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -155,7 +155,8 @@ int nfsd_vers(int vers, enum vers_op cha
 
 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:


Patches currently in stable-queue which might be from neilb@suse.com are

queue-4.9/md-cluster-free-md_cluster_info-if-node-leave-cluster.patch
queue-4.9/autofs-fix-careless-error-in-recent-commit.patch
queue-4.9/raid5-set-r5_expanded-on-parity-devices-as-well-as-data.patch
queue-4.9/nfsd-fix-nfsd_reset_versions-for-nfsv4.patch
queue-4.9/nfsd-fix-nfsd_minorversion-..-nfsd_avail.patch