autofs - fix symlinks aren't checked for expiry
Subsystems (2)
Ian Kent
maintainerPATCH 1/1 autofs - fix symlinks aren't checked for expiry
From: Ian Kent <[email protected]>
The autofs4 module doesn't consider symlinks for expire.
The user space daemon has focused on the use of bind mounts instead of symlinks for a long time now. But, with the future addition of amd map parsing in automount(8), not to mention amd iteslf, symlink expiry is needed.
The direct and offset mount types can't be symlinks and the tree mounts of version 4 were always real mounts so only indirect mounts need expire symlinks.
Signed-off-by Ian Kent <[email protected]>
--- fs/autofs4/expire.c | 12 ++++++++++++ fs/autofs4/symlink.c | 3 +++ 2 files changed, 15 insertions(+)
fs/autofs4/expire.c +12 -0
@@ -402,6 +402,18 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, goto next; } +if (dentry->d_inode &&S_ISLNK (dentry->d_inode->i_mode)) { +/* +* A symlink can't be "busy" in the usual sense so +* just check last used for expire timeout. +*/ +if (autofs4_can_expire (dentry, timeout, do_now)) { + expired = dentry; + goto found; + } + goto next; + } +if (simple_empty (dentry)) goto next;
fs/autofs4/symlink.c +3 -0
@@ -14,6 +14,9 @@static void *autofs4_follow_link (struct dentry *dentry,struct nameidata *nd) { +struct autofs_info *ino =autofs4_dentry_ino (dentry); +if (ino) + ino->last_used = jiffies;nd_set_link (nd, dentry->d_inode->i_private);return NULL ; }