Return-Path: Received: from fieldses.org ([173.255.197.46]:32778 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933740AbdCJW01 (ORCPT ); Fri, 10 Mar 2017 17:26:27 -0500 Date: Fri, 10 Mar 2017 17:26:24 -0500 From: "J. Bruce Fields" To: NeilBrown Cc: Trond Myklebust , linux-nfs@vger.kernel.org Subject: Re: [PATCH 2/3] NFSD: fix nfsd_minorversion(.., NFSD_AVAIL) Message-ID: <20170310222624.GO29791@fieldses.org> References: <148910618557.3032.8265198632788708076.stgit@noble> <148910619931.3032.2841124907029105276.stgit@noble> <20170310221648.GN29791@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20170310221648.GN29791@fieldses.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Fri, Mar 10, 2017 at 05:16:48PM -0500, 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. But, whatever, I'm OK with it. I'll queue all three up for 4.11 absent any objection. --b. > > > So change to return 1 if it is supported, and zero if not. > > i.e. an error is never returned. > > > > Signed-off-by: NeilBrown > > --- > > 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: > >