Merge branch 'master' into tk71

[mv-sheeva.git] / fs / autofs4 / dev-ioctl.c

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index ba4a38b9c22ff63d9897ad59c30c1479a0c54fed..1442da4860e5ef6ad303fd5868fa70c68a5601a6 100644 (file)
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -551,7 +551,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
 
                err = have_submounts(path.dentry);
 
-               if (follow_down(&path))
+               if (follow_down_one(&path))
                        magic = path.mnt->mnt_sb->s_magic;
        }
 
@@ -724,6 +724,7 @@ static const struct file_operations _dev_ioctl_fops = {
        .unlocked_ioctl  = autofs_dev_ioctl,
        .compat_ioctl = autofs_dev_ioctl_compat,
        .owner   = THIS_MODULE,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice _autofs_dev_ioctl_misc = {