The patch titled
autofs4: zero timeout prevents shutdown
has been removed from the -mm tree. Its filename is
autofs4-zero-timeout-prevents-shutdown.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: autofs4: zero timeout prevents shutdown
From: Ian Kent <raven@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/autofs4/expire.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/autofs4/expire.c~autofs4-zero-timeout-prevents-shutdown fs/autofs4/expire.c
--- a/fs/autofs4/expire.c~autofs4-zero-timeout-prevents-shutdown
+++ a/fs/autofs4/expire.c
@@ -32,7 +32,7 @@ static inline int autofs4_can_expire(str
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_dir
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_ind
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;
diff -puN /dev/null /dev/null
_
Patches currently in -mm which might be from raven@xxxxxxxxxx are
origin.patch
autofs4-needs-to-force-fail-return-revalidate.patch
autofs4-autofs4_follow_link-false-negative-fix.patch
autofs4-pending-flag-not-cleared-on-mount-fail.patch
autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
