diff --git a/[refs] b/[refs] index 4836c66a7123..16771a86bfb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954829863d3017d1c14600c975f9b92696d36836 +refs/heads/master: ce8a5dbdf9e709bdaf4618d7ef8cceb91e8adc69 diff --git a/trunk/fs/autofs4/expire.c b/trunk/fs/autofs4/expire.c index 01443ce43ee7..13ddec92341c 100644 --- a/trunk/fs/autofs4/expire.c +++ b/trunk/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 */