aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-05-12 12:08:02 +0530
committerChirayu Desai <cdesai@cyanogenmod.org>2013-05-12 12:08:02 +0530
commited4391aacb68993811c817d591a53d075af9ac12 (patch)
tree0f518af8553d1ab22d4615f1c6a69e420b43a9fd /fs
parentf163157f7a299b4646e0c005a8658d5926125b8f (diff)
parentea88a24912c191babee3a3a2658ade2d53b880a9 (diff)
downloadkernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.zip
kernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.tar.gz
kernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.tar.bz2
Merge tag 'v3.0.78' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.78 stable release
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 450f529..2c69d12 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)
/* This is an autofs submount, we can't expire it */
if (autofs_type_indirect(sbi->type))
goto done;
-
- /*
- * Otherwise it's an offset mount and we need to check
- * if we can umount its mount, if there is one.
- */
- if (!d_mountpoint(path.dentry)) {
- status = 0;
- goto done;
- }
}
/* Update the expiry counter if fs is busy */