2 files changed, 11 insertions, 9 deletions

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 5ec2d49e9bb6..e57d3c50f75f 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -821,11 +821,12 @@ static void ib_uverbs_remove_one(struct ib_device *device)
         kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);
 }
 
-static struct super_block *uverbs_event_get_sb(struct file_system_type *fs_type, int flags,
-                                               const char *dev_name, void *data)
+static int uverbs_event_get_sb(struct file_system_type *fs_type, int flags,
+                               const char *dev_name, void *data,
+                               struct vfsmount *mnt)
 {
         return get_sb_pseudo(fs_type, "infinibandevent:", NULL,
-                             INFINIBANDEVENTFS_MAGIC);
+                             INFINIBANDEVENTFS_MAGIC, mnt);
 }
 
 static struct file_system_type uverbs_event_fs = {
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index e274120567e1..63de3046aff3 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -542,13 +542,14 @@ bail:
         return ret;
 }
 
-static struct super_block *ipathfs_get_sb(struct file_system_type *fs_type,
-                                        int flags, const char *dev_name,
-                                        void *data)
+static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,
+                        const char *dev_name, void *data, struct vfsmount *mnt)
 {
-        ipath_super = get_sb_single(fs_type, flags, data,
-                                    ipathfs_fill_super);
-        return ipath_super;
+        int ret = get_sb_single(fs_type, flags, data,
+                                    ipathfs_fill_super, mnt);
+        if (ret >= 0)
+                ipath_super = mnt->mnt_sb;
+        return ret;
 }
 
 static void ipathfs_kill_super(struct super_block *s)