summaryrefslogtreecommitdiffstats
path: root/fs/autofs
diff options
context:
space:
mode:
authorIan Kent2018-08-22 06:58:48 +0200
committerLinus Torvalds2018-08-22 19:52:49 +0200
commitd1055565bdc27fd4dc90a91988b938b949662025 (patch)
treee84f1575d53731b47cb84f65893b82b67da18df6 /fs/autofs
parentautofs: fix inconsistent use of now variable (diff)
downloadkernel-qcow2-linux-d1055565bdc27fd4dc90a91988b938b949662025.tar.gz
kernel-qcow2-linux-d1055565bdc27fd4dc90a91988b938b949662025.tar.xz
kernel-qcow2-linux-d1055565bdc27fd4dc90a91988b938b949662025.zip
autofs: fix clearing AUTOFS_EXP_LEAVES in autofs_expire_indirect()
The expire flag AUTOFS_EXP_LEAVES is cleared before the second call to should_expire() in autofs_expire_indirect() but the parameter passed in the second call is incorrect. Fortunately AUTOFS_EXP_LEAVES expire flag has not been used for a long time but might be needed in the future so fix it rather than remove the expire leaves functionality. Link: http://lkml.kernel.org/r/152937732410.21213.7447294898147765076.stgit@pluto.themaw.net Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs')
-rw-r--r--fs/autofs/expire.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c
index 295feec10ea6..41855cdc5630 100644
--- a/fs/autofs/expire.c
+++ b/fs/autofs/expire.c
@@ -467,7 +467,7 @@ struct dentry *autofs_expire_indirect(struct super_block *sb,
* things have changed.
*/
flags &= ~AUTOFS_EXP_LEAVES;
- found = should_expire(expired, mnt, timeout, how);
+ found = should_expire(expired, mnt, timeout, flags);
if (!found || found != expired)
/* Something has changed, continue */
goto next;