NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)

NeilBrown · J. Bruce Fields · commit 928c6fb3a9bf · 2017-03-10T17:04:50.000-05:00
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 &lt;neilb@suse.com&gt;
Signed-off-by: J. Bruce Fields &lt;bfields@redhat.com&gt;
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
@@ -167,7 +167,8 @@ nfsd_adjust_nfsd_versions4(void)
 
 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:

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ nfsd_adjust_nfsd_versions4(void)`
`167`	`167`
`168`	`168`	`int nfsd_minorversion(u32 minorversion, enum vers_op change)`
`169`	`169`	`{`
`170`		`- if (minorversion > NFSD_SUPPORTED_MINOR_VERSION)`
	`170`	`+ if (minorversion > NFSD_SUPPORTED_MINOR_VERSION &&`
	`171`	`+ change != NFSD_AVAIL)`
`171`	`172`	`return -1;`
`172`	`173`	`switch(change) {`
`173`	`174`	`case NFSD_SET:`