Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6] / fs / autofs4 / init.c

diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
index acecec8578ce9e08d4e9998405ab4d74778d3be1..723a1c5e361b2786c8f8ec97e9332b77b1484e15 100644 (file)
--- a/fs/autofs4/init.c
+++ b/fs/autofs4/init.c
@@ -14,17 +14,17 @@
 #include <linux/init.h>
 #include "autofs_i.h"
 
-static struct super_block *autofs_get_sb(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data)
+static int autofs_get_sb(struct file_system_type *fs_type,
+       int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 {
-       return get_sb_nodev(fs_type, flags, data, autofs4_fill_super);
+       return get_sb_nodev(fs_type, flags, data, autofs4_fill_super, mnt);
 }
 
 static struct file_system_type autofs_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "autofs",
        .get_sb         = autofs_get_sb,
-       .kill_sb        = kill_anon_super,
+       .kill_sb        = autofs4_kill_sb,
 };
 
 static int __init init_autofs4_fs(void)