Re: [ANNOUNCE] autofs 5.1.8 release
"NeilBrown" <[email protected]>
| Newsgroups | org.kernel.vger.autofs,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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. Maybe the following is best. NeilBrown From: NeilBrown <[email protected]> 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(). We can test if TCP was requested by examining the 'proto' parameter. Signed-off-by: NeilBrown <[email protected]> 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;