aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Jeffery2013-05-06 00:49:30 -0500
committerGreg Kroah-Hartman2013-05-11 15:53:50 -0500
commit7f9bc00875dd46bc964b37825ba6bb2024a365e4 (patch)
tree10c13e49a7eb7cb13129456936dbf1275b81fadc /fs
parent228c19cd8f6d576dc6ab7d641b59aacc98952b9f (diff)
downloadkernel-omap-7f9bc00875dd46bc964b37825ba6bb2024a365e4.tar.gz
kernel-omap-7f9bc00875dd46bc964b37825ba6bb2024a365e4.tar.xz
kernel-omap-7f9bc00875dd46bc964b37825ba6bb2024a365e4.zip
autofs - remove autofs dentry mount check
commit ce8a5dbdf9e709bdaf4618d7ef8cceb91e8adc69 upstream. When checking if an autofs mount point is busy it isn't sufficient to only check if it's a mount point. For example, if the mount of an offset mountpoint in a tree is denied for this host by its export and the dentry becomes a process working directory the check incorrectly returns the mount as not in use at expire. This can happen since the default when mounting within a tree is nostrict, which means ingnore mount fails on mounts within the tree and continue. The nostrict option is meant to allow mounting in this case. Signed-off-by: David Jeffery <djeffery@redhat.com> Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/autofs4/expire.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 01443ce43ee7..13ddec92341c 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -61,15 +61,6 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
61 /* This is an autofs submount, we can't expire it */ 61 /* This is an autofs submount, we can't expire it */
62 if (autofs_type_indirect(sbi->type)) 62 if (autofs_type_indirect(sbi->type))
63 goto done; 63 goto done;
64
65 /*
66 * Otherwise it's an offset mount and we need to check
67 * if we can umount its mount, if there is one.
68 */
69 if (!d_mountpoint(path.dentry)) {
70 status = 0;
71 goto done;
72 }
73 } 64 }
74 65
75 /* Update the expiry counter if fs is busy */ 66 /* Update the expiry counter if fs is busy */