Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / fs / autofs4 / expire.c

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 8fd92eaf936d2701d292fcc1d4deafeacd6024f0..b8ce02607d66bacd03d60acad9b99ffd9e48d7d2 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -113,10 +113,6 @@ static int autofs4_direct_busy(struct vfsmount *mnt,
        DPRINTK("top %p %.*s",
                top, (int) top->d_name.len, top->d_name.name);
 
-       /* Not a mountpoint - give up */
-       if (!d_mountpoint(top))
-               return 1;
-
        /* If it's busy update the expiry counters */
        if (!may_umount_tree(mnt)) {
                struct autofs_info *ino = autofs4_dentry_ino(top);
@@ -424,7 +420,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,
        if (arg && get_user(do_now, arg))
                return -EFAULT;
 
-       if (sbi->type & AUTOFS_TYP_DIRECT)
+       if (sbi->type & AUTOFS_TYPE_DIRECT)
                dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);
        else
                dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);