Re: [PATCH 2/3] NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)

[NeilBrown <neilb@suse.com>]

[-- Attachment #1: Type: text/plain, Size: 1316 bytes --]

On Fri, Mar 10 2017, J. Bruce Fields wrote:

> On Fri, Mar 10, 2017 at 11:36:39AM +1100, NeilBrown wrote:
>> 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.
>
> It's used?  I don't see it.--b.

You are correct of course.  NFSD_AVAIL is used once, but not with
nfsd_minorversion.
Would it ever make sense to selectively include different minor
versions at compile time?  Probably not, but it probably doesn't matter
anyway.

NeilBrown


>
>> 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>
>> ---
>>  fs/nfsd/nfssvc.c |    3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
>> index 786a4a2cb2d7..892137b1e330 100644
>> --- 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:
>> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]