Skip to contentSkip to conversation

Current patch to fix autofs symlink expiry

PATCH New Ian Kent 2 participants 4 messages Dec 27, 2013 – Dec 28, 2013

Subsystems (2)
lore
Share & tools
lore

Ian Kent

author maintainer
#0 lore raw

PATCH 1/1 Current patch to fix autofs symlink expiry

This patch obsoletes both the current patches:
autofs-fix-symlinks-arent-checked-for-expiry.patch autofs-fix-fix-symlinks-arent-checked-for-expiry.patch

It's a merge of both of these patches with an updated description.

---

Ian Kent (1):
autofs - fix symlinks aren't checked for expiry

 fs/autofs4/expire.c  |   14 ++++++++++++++
 fs/autofs4/symlink.c |    4 ++++
 2 files changed, 18 insertions(+)
Signature · 1 line
Ian
author maintainer
#1 lore raw

PATCH 1/1 autofs - fix symlinks aren't checked for expiry

From: Ian Kent <[email protected]>

The autofs4 module doesn't consider symlinks for expire as it did in the older autofs v3 module (so it's actually a long stnding regression).

The user space daemon has focused on the use of bind mounts instead of symlinks for a long time now and that's why this has not been noticed. But with the future addition of amd map parsing to automount(8), not to mention amd itself (of am-utils), symlink expiry will be 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.

Since the current users of the autofs4 module haven't reproted this as a problem to date this patch probably isn't a candidate for backport to stable.

---
 fs/autofs4/expire.c  |   14 ++++++++++++++
 fs/autofs4/symlink.c |    4 ++++
 2 files changed, 18 insertions(+)
fs/autofs4/expire.c +14 -0
index 3d9d3f5..394e90b 100644
@@ -402,6 +402,20 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
 			goto next;
 		}
 
+		if (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode)) {
+			DPRINTK("checking symlink %p %.*s",
+				dentry, (int)dentry->d_name.len, dentry->d_name.name);
+			/*
+			 * 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 +4 -0
index f27c094..1e8ea19 100644
@@ -14,6 +14,10 @@
 
 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
+	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+	struct autofs_info *ino = autofs4_dentry_ino(dentry);
+	if (ino && !autofs4_oz_mode(sbi))
+		ino->last_used = jiffies;
 	nd_set_link(nd, dentry->d_inode->i_private);
 	return NULL;
 }
#2 lore raw

Re: [PATCH] autofs - fix symlinks aren't checked for expiry

On Fri, Dec 27, 2013 at 5:32 AM, Ian Kent <[email protected]> wrote:

Hi,

saw some typos...

Quoted 4 lines

From: Ian Kent <[email protected]>

The autofs4 module doesn't consider symlinks for expire as it did in the older autofs v3 module (so it's actually a long stnding

s/stnding/standing

Quoted 8 lines

regression).

The user space daemon has focused on the use of bind mounts instead of symlinks for a long time now and that's why this has not been noticed. But with the future addition of amd map parsing to automount(8), not to mention amd itself (of am-utils), symlink expiry will be needed.

Quoted 5 lines

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.

Since the current users of the autofs4 module haven't reproted

s/reproted/reported

- Sedat -

Quoted 54 lines

this as a problem to date this patch probably isn't a candidate for backport to stable.

---
 fs/autofs4/expire.c  |   14 ++++++++++++++
 fs/autofs4/symlink.c |    4 ++++
 2 files changed, 18 insertions(+)
fs/autofs4/expire.c +14 -0
index 3d9d3f5..394e90b 100644
@@ -402,6 +402,20 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
                        goto next;
                }
 
+               if (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode)) {
+                       DPRINTK("checking symlink %p %.*s",
+                               dentry, (int)dentry->d_name.len, dentry->d_name.name);
+                       /*
+                        * 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 +4 -1
index f27c094..1e8ea19 100644
@@ -14,6 +14,10 @@
 
 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
+       struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+       struct autofs_info *ino = autofs4_dentry_ino(dentry);
+       if (ino && !autofs4_oz_mode(sbi))
+               ino->last_used = jiffies;
        nd_set_link(nd, dentry->d_inode->i_private);
        return NULL;
 }
 
--

To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#3 lore raw

Re: [PATCH] autofs - fix symlinks aren't checked for expiry

Quoted 5 lines · Sedat Dilek

On Fri, Dec 27, 2013 at 5:32 AM, Ian Kent <[email protected]> wrote:

Hi,

saw some typos...

Right, I'm pretty tired, and seem to be so a lot these days.

Andrew, let me fix the typos and re-submit the patch.

Quoted 80 lines
Quoted 5 lines

From: Ian Kent <[email protected]>

The autofs4 module doesn't consider symlinks for expire as it did in the older autofs v3 module (so it's actually a long stnding

s/stnding/standing

Quoted 8 lines

regression).

The user space daemon has focused on the use of bind mounts instead of symlinks for a long time now and that's why this has not been noticed. But with the future addition of amd map parsing to automount(8), not to mention amd itself (of am-utils), symlink expiry will be needed.

Quoted 5 lines

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.

Since the current users of the autofs4 module haven't reproted

s/reproted/reported

- Sedat -

Quoted 54 lines

this as a problem to date this patch probably isn't a candidate for backport to stable.

---
 fs/autofs4/expire.c  |   14 ++++++++++++++
 fs/autofs4/symlink.c |    4 ++++
 2 files changed, 18 insertions(+)
fs/autofs4/expire.c +14 -0
index 3d9d3f5..394e90b 100644
@@ -402,6 +402,20 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
                        goto next;
                }
 
+               if (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode)) {
+                       DPRINTK("checking symlink %p %.*s",
+                               dentry, (int)dentry->d_name.len, dentry->d_name.name);
+                       /*
+                        * 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 +4 -1
index f27c094..1e8ea19 100644
@@ -14,6 +14,10 @@
 
 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
+       struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+       struct autofs_info *ino = autofs4_dentry_ino(dentry);
+       if (ino && !autofs4_oz_mode(sbi))
+               ino->last_used = jiffies;
        nd_set_link(nd, dentry->d_inode->i_private);
        return NULL;
 }
 
--

To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html