Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / ipath / ipath_fs.c

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index e274120567e1d5068996efe74a0a4a41d3619321..a5eb30a06a5cb0698c2f93f44202ac3bcf76a200 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
  * Copyright (c) 2006 PathScale, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -31,7 +32,6 @@
  */
 
 #include <linux/version.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
@@ -191,8 +191,8 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
        portinfo[4] = (dd->ipath_lid << 16);
 
        /*
-        * Notimpl yet SMLID (should we store this in the driver, in case
-        * SMA dies?)  CapabilityMask is 0, we don't support any of these
+        * Notimpl yet SMLID.
+        * CapabilityMask is 0, we don't support any of these
         * DiagCode is 0; we don't store any diag info for now Notimpl yet
         * M_KeyLeasePeriod (we don't support M_Key)
         */
@@ -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)