Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1055565 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

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: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2fd9944f

fs/autofs/expire.c

+1 −1
Original line number Diff line number Diff line
@@ -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;