Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / fs / autofs4 / dev-ioctl.c

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index f71dac9..00bf8fc 100644 (file)
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -19,7 +19,6 @@
 #include <linux/sched.h>
 #include <linux/compat.h>
 #include <linux/syscalls.h>
-#include <linux/smp_lock.h>
 #include <linux/magic.h>
 #include <linux/dcache.h>
 #include <linux/uaccess.h>
@@ -212,7 +211,7 @@ static int find_autofs_mount(const char *pathname,
                                err = 0;
                        }
                }
-               if (!follow_up(&path.mnt, &path.dentry))
+               if (!follow_up(&path))
                        break;
        }
        path_put(&path);
@@ -562,7 +561,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
                err = have_submounts(path.dentry);
 
                if (path.mnt->mnt_mountpoint != path.mnt->mnt_root) {
-                       if (follow_down(&path.mnt, &path.dentry))
+                       if (follow_down(&path))
                                magic = path.mnt->mnt_sb->s_magic;
                }
        }