[PATCH] autofs4: zero timeout prevents shutdown (c0ba7e51) · Commits · 戴 / test

If the timeout of an autofs mount is set to zero then umounts are disabled. This works fine, however the kernel module checks the expire timeout and goes no further if it is zero. This is not the right thing to do at shutdown as the module is passed an option to expire mounts regardless of their timeout setting. This patch allows autofs to honor the force expire option. Signed-off-by:

Ian Kent <raven@themaw.net> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

fs/autofs4/expire.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ static inline int autofs4_can_expire(struct dentry *dentry,

		if (!do_now) {
		/* Too young to die */
		if (time_after(ino->last_used + timeout, now))
		if (!timeout \|\| time_after(ino->last_used + timeout, now))
		return 0;

		/* update last_used here :-
		@@ -253,7 +253,7 @@ static struct dentry autofs4_expire_direct(struct super_block sb,
		struct dentry *root = dget(sb->s_root);
		int do_now = how & AUTOFS_EXP_IMMEDIATE;

		if (!sbi->exp_timeout \|\| !root)
		if (!root)
		return NULL;

		now = jiffies;
		@@ -293,7 +293,7 @@ static struct dentry autofs4_expire_indirect(struct super_block sb,
		int do_now = how & AUTOFS_EXP_IMMEDIATE;
		int exp_leaves = how & AUTOFS_EXP_LEAVES;

		if ( !sbi->exp_timeout \|\| !root )
		if (!root)
		return NULL;

		now = jiffies;

Admin message