convert get_sb_single() users

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

10 files changed, 55 insertions, 56 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index af0600143d1c..82bbb5967aa9 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -29,33 +29,33 @@
 static struct vfsmount *dev_mnt;
 
 #if defined CONFIG_DEVTMPFS_MOUNT
-static int dev_mount = 1;
+static int mount_dev = 1;
 #else
-static int dev_mount;
+static int mount_dev;
 #endif
 
 static DEFINE_MUTEX(dirlock);
 
 static int __init mount_param(char *str)
 {
-        dev_mount = simple_strtoul(str, NULL, 0);
+        mount_dev = simple_strtoul(str, NULL, 0);
         return 1;
 }
 __setup("devtmpfs.mount=", mount_param);
 
-static int dev_get_sb(struct file_system_type *fs_type, int flags,
-                      const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *dev_mount(struct file_system_type *fs_type, int flags,
+                      const char *dev_name, void *data)
 {
 #ifdef CONFIG_TMPFS
-        return get_sb_single(fs_type, flags, data, shmem_fill_super, mnt);
+        return mount_single(fs_type, flags, data, shmem_fill_super);
 #else
-        return get_sb_single(fs_type, flags, data, ramfs_fill_super, mnt);
+        return mount_single(fs_type, flags, data, ramfs_fill_super);
 #endif
 }
 
 static struct file_system_type dev_fs_type = {
         .name = "devtmpfs",
-        .get_sb = dev_get_sb,
+        .mount = dev_mount,
         .kill_sb = kill_litter_super,
 };
 
@@ -351,7 +351,7 @@ int devtmpfs_mount(const char *mntdir)
 {
         int err;
 
-        if (!dev_mount)
+        if (!mount_dev)
                 return 0;
 
         if (!dev_mnt)
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 12d5bf76302c..8c8afc716b98 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -362,13 +362,13 @@ bail:
         return ret;
 }
 
-static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,
-                        const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *ipathfs_mount(struct file_system_type *fs_type,
+                        int flags, const char *dev_name, void *data)
 {
-        int ret = get_sb_single(fs_type, flags, data,
-                                    ipathfs_fill_super, mnt);
-        if (ret >= 0)
-                ipath_super = mnt->mnt_sb;
+        struct dentry *ret;
+        ret = mount_single(fs_type, flags, data, ipathfs_fill_super);
+        if (!IS_ERR(ret))
+                ipath_super = ret->d_sb;
         return ret;
 }
 
@@ -411,7 +411,7 @@ bail:
 static struct file_system_type ipathfs_fs_type = {
         .owner =        THIS_MODULE,
         .name =         "ipathfs",
-        .get_sb =       ipathfs_get_sb,
+        .mount =        ipathfs_mount,
         .kill_sb =      ipathfs_kill_super,
 };
 
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index 7e433d75c775..f99bddc01716 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -555,13 +555,13 @@ bail:
         return ret;
 }
 
-static int qibfs_get_sb(struct file_system_type *fs_type, int flags,
-                        const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *qibfs_mount(struct file_system_type *fs_type, int flags,
+                        const char *dev_name, void *data)
 {
-        int ret = get_sb_single(fs_type, flags, data,
-                                qibfs_fill_super, mnt);
-        if (ret >= 0)
-                qib_super = mnt->mnt_sb;
+        struct dentry *ret;
+        ret = mount_single(fs_type, flags, data, qibfs_fill_super);
+        if (!IS_ERR(ret))
+                qib_super = ret->d_sb;
         return ret;
 }
 
@@ -603,7 +603,7 @@ int qibfs_remove(struct qib_devdata *dd)
 static struct file_system_type qibfs_fs_type = {
         .owner =        THIS_MODULE,
         .name =         "ipathfs",
-        .get_sb =       qibfs_get_sb,
+        .mount =        qibfs_mount,
         .kill_sb =      qibfs_kill_super,
 };
 
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 2b83850997c3..b4faed7fe0d3 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -125,16 +125,16 @@ fail:
         return -ENOMEM;
 }
 
-static int capifs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *capifs_mount(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data)
 {
-        return get_sb_single(fs_type, flags, data, capifs_fill_super, mnt);
+        return mount_single(fs_type, flags, data, capifs_fill_super);
 }
 
 static struct file_system_type capifs_fs_type = {
         .owner          = THIS_MODULE,
         .name           = "capifs",
-        .get_sb         = capifs_get_sb,
+        .mount          = capifs_mount,
         .kill_sb        = kill_anon_super,
 };
 
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 0a53500636c9..d2d5d23416dd 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -91,11 +91,10 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);
 
 
-static int ibmasmfs_get_super(struct file_system_type *fst,
-                        int flags, const char *name, void *data,
-                        struct vfsmount *mnt)
+static struct dentry *ibmasmfs_mount(struct file_system_type *fst,
+                        int flags, const char *name, void *data)
 {
-        return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);
+        return mount_single(fst, flags, data, ibmasmfs_fill_super);
 }
 
 static const struct super_operations ibmasmfs_s_ops = {
@@ -108,7 +107,7 @@ static const struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;
 static struct file_system_type ibmasmfs_type = {
         .owner          = THIS_MODULE,
         .name           = "ibmasmfs",
-        .get_sb         = ibmasmfs_get_super,
+        .mount          = ibmasmfs_mount,
         .kill_sb        = kill_litter_super,
 };
 
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 449de59bf35b..e9ff6f7770be 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -259,17 +259,17 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
 }
 
 
-static int oprofilefs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *oprofilefs_mount(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data)
 {
-        return get_sb_single(fs_type, flags, data, oprofilefs_fill_super, mnt);
+        return mount_single(fs_type, flags, data, oprofilefs_fill_super);
 }
 
 
 static struct file_system_type oprofilefs_type = {
         .owner          = THIS_MODULE,
         .name           = "oprofilefs",
-        .get_sb         = oprofilefs_get_sb,
+        .mount          = oprofilefs_mount,
         .kill_sb        = kill_litter_super,
 };
 
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index e2f63c0ea09d..9819a4cc3b26 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -574,16 +574,16 @@ static void fs_remove_file (struct dentry *dentry)
 
 /* --------------------------------------------------------------------- */
 
-static int usb_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct dentry *usb_mount(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data)
 {
-        return get_sb_single(fs_type, flags, data, usbfs_fill_super, mnt);
+        return mount_single(fs_type, flags, data, usbfs_fill_super);
 }
 
 static struct file_system_type usb_fs_type = {
         .owner =        THIS_MODULE,
         .name =         "usbfs",
-        .get_sb =       usb_get_sb,
+        .mount =        usb_mount,
         .kill_sb =      kill_litter_super,
 };
 
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index f276e9594f00..4a830df4fc31 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1176,9 +1176,9 @@ invalid:
 
 /* "mount -t functionfs dev_name /dev/function" ends up here */
 
-static int
-ffs_fs_get_sb(struct file_system_type *t, int flags,
-              const char *dev_name, void *opts, struct vfsmount *mnt)
+static struct dentry *
+ffs_fs_mount(struct file_system_type *t, int flags,
+              const char *dev_name, void *opts)
 {
         struct ffs_sb_fill_data data = {
                 .perms = {
@@ -1194,14 +1194,14 @@ ffs_fs_get_sb(struct file_system_type *t, int flags,
 
         ret = functionfs_check_dev_callback(dev_name);
         if (unlikely(ret < 0))
-                return ret;
+                return ERR_PTR(ret);
 
         ret = ffs_fs_parse_opts(&data, opts);
         if (unlikely(ret < 0))
-                return ret;
+                return ERR_PTR(ret);
 
         data.dev_name = dev_name;
-        return get_sb_single(t, flags, &data, ffs_sb_fill, mnt);
+        return mount_single(t, flags, &data, ffs_sb_fill);
 }
 
 static void
@@ -1220,7 +1220,7 @@ ffs_fs_kill_sb(struct super_block *sb)
 static struct file_system_type ffs_fs_type = {
         .owner          = THIS_MODULE,
         .name           = "functionfs",
-        .get_sb         = ffs_fs_get_sb,
+        .mount          = ffs_fs_mount,
         .kill_sb        = ffs_fs_kill_sb,
 };
 
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index ba145e7fbe03..3ed73f49cf18 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -2097,11 +2097,11 @@ enomem0:
 }
 
 /* "mount -t gadgetfs path /dev/gadget" ends up here */
-static int
-gadgetfs_get_sb (struct file_system_type *t, int flags,
-                const char *path, void *opts, struct vfsmount *mnt)
+static struct dentry *
+gadgetfs_mount (struct file_system_type *t, int flags,
+                const char *path, void *opts)
 {
-        return get_sb_single (t, flags, opts, gadgetfs_fill_super, mnt);
+        return mount_single (t, flags, opts, gadgetfs_fill_super);
 }
 
 static void
@@ -2119,7 +2119,7 @@ gadgetfs_kill_sb (struct super_block *sb)
 static struct file_system_type gadgetfs_type = {
         .owner          = THIS_MODULE,
         .name           = shortname,
-        .get_sb         = gadgetfs_get_sb,
+        .mount          = gadgetfs_mount,
         .kill_sb        = gadgetfs_kill_sb,
 };
 
diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index d6662b789b6b..f6339d11d59c 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -121,17 +121,17 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
         return rc;
 }
 
-static int xenfs_get_sb(struct file_system_type *fs_type,
+static int xenfs_mount(struct file_system_type *fs_type,
                         int flags, const char *dev_name,
-                        void *data, struct vfsmount *mnt)
+                        void *data)
 {
-        return get_sb_single(fs_type, flags, data, xenfs_fill_super, mnt);
+        return mount_single(fs_type, flags, data, xenfs_fill_super);
 }
 
 static struct file_system_type xenfs_type = {
         .owner =        THIS_MODULE,
         .name =         "xenfs",
-        .get_sb =       xenfs_get_sb,
+        .mount =        xenfs_mount,
         .kill_sb =      kill_litter_super,
 };