Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b042424ce0e68f576fdab268adeeff90d48da8a8.camel@themaw.net>
Subject: Re: [ANNOUNCE] autofs 5.1.8 release
From:   Ian Kent <raven@themaw.net>
To:     NeilBrown <neilb@suse.de>
Cc:     autofs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org
Date:   Mon, 14 Feb 2022 13:34:46 +0800
In-Reply-To: <164444398868.27779.4643380819577932837@noble.neil.brown.name>
References: <b54fb31652a4ba76b39db66b8ae795ee3af6f025.camel@themaw.net>
         <164444398868.27779.4643380819577932837@noble.neil.brown.name>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.3 (3.42.3-1.fc35) 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Thu, 2022-02-10 at 08:59 +1100, NeilBrown wrote:
> On Tue, 19 Oct 2021, Ian Kent wrote:
> > Hi all,
> > 
> > It's time for a release, autofs-5.1.8.
> > 
> ...
> > - also require TCP_REQUESTED when setting NFS port.
> 
> Unfortunately that last patch is buggy.  TCP_REQUESTED is masked out
> in
> the caller.

Mmm ... sounds like I've made a mistake there.
I'll need to sort that out, thanks for pointing it out.

> 
> Maybe the following is best.
> 
> NeilBrown
> 
> From: NeilBrown <neilb@suse.de>
> Subject: [PATCH] Test TCP request correctly in nfs_get_info()
> 
> The TCP_REQUESTED flag is masked out by the caller, so it never gets
> to
> nfs_get_info().

That wasn't my intent, I'll need to look at it again.
The case I'm trying to cover is fairly specific so I will need to
look at it again.

Ian

> We can test if TCP was requested by examining the 'proto' parameter.
> 
> Signed-off-by: NeilBrown <neilb@suse.de>
> 
> diff --git a/modules/replicated.c b/modules/replicated.c
> index 09075dd0c1b4..3ac7ee432e73 100644
> --- a/modules/replicated.c
> +++ b/modules/replicated.c
> @@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt,
> struct host *host,
>  
>         rpc_info->proto = proto;
>         if (port < 0) {
> -               if ((version & NFS4_REQUESTED) && (version &
> TCP_REQUESTED))
> +               if ((version & NFS4_REQUESTED) && (proto ==
> IPPROTO_TCP))
>                         rpc_info->port = NFS_PORT;
>                 else
>                         port = 0;
>