Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
From:   "NeilBrown" <neilb@suse.de>
To:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <Anna.Schumaker@netapp.com>
Cc:     linux-nfs@vger.kernel.org
Subject: [PATCH] NFS: fix minor issues with automount expiry.
Date:   Wed, 28 Jul 2021 09:15:31 +1000
Message-id: <162742773175.21659.17666555162574585184@noble.neil.brown.name>
Precedence: bulk


1/ If automount expiry timeout is set to zero, new mounts are not added
   to the list.  If the timeout is then changed, those previously
   mounts will still not be timed out.  This is probably not what
   would be expected.  Simply refusing to start the timer
   is sufficient to prevent timeout.

2/ the MODULE_PARM_DESC for nfs_mountpoint_expiry_timeout is missing
   a space between to two sentences.  This is hidden by the fact that
   the string is broken onto to line - against current policy.
   So join onto a single (long) line, and add the space.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 fs/nfs/namespace.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index bc0c698f3350..be5e77a80811 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -196,10 +196,10 @@ struct vfsmount *nfs_d_automount(struct path *path)
 		goto out_fc;
=20
 	mntget(mnt); /* prevent immediate expiration */
+	mnt_set_expiry(mnt, &nfs_automount_list);
 	if (timeout <=3D 0)
 		goto out_fc;
=20
-	mnt_set_expiry(mnt, &nfs_automount_list);
 	schedule_delayed_work(&nfs_automount_task, timeout);
=20
 out_fc:
@@ -366,5 +366,4 @@ static const struct kernel_param_ops param_ops_nfs_timeou=
t =3D {
=20
 module_param(nfs_mountpoint_expiry_timeout, nfs_timeout, 0644);
 MODULE_PARM_DESC(nfs_mountpoint_expiry_timeout,
-		"Set the NFS automounted mountpoint timeout value (seconds)."
-		"Values <=3D 0 turn expiration off.");
+		"Set the NFS automounted mountpoint timeout value (seconds). Values <=3D 0=
 turn expiration off.");
--=20
2.32.0