Skip to contentSkip to conversation

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

PATCH [email protected] 1 participant 1 message Dec 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.4-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.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Mon Dec 18 14:47:43 CET 2017

From: NeilBrown <[email protected]>
Date: Fri, 10 Mar 2017 11:36:39 +1100
Subject: NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)

From: NeilBrown <[email protected]>

[ 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.

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

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