file export-do_kern_mount.patch was initially added on branch b1_5.

[fs/lustre-release.git] / lustre / smfs / super.c

diff --git a/lustre/smfs/super.c b/lustre/smfs/super.c
index dfbe801..f2ab435 100644 (file)
--- a/lustre/smfs/super.c
+++ b/lustre/smfs/super.c
@@ -46,8 +46,8 @@
 #include "smfs_internal.h"
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static struct super_block *smfs_read_super(struct super_block *sb, void *data, 
-                                           int silent)
+static struct super_block *smfs_read_super(struct super_block *sb, 
+                                           void *data, int silent)
 {
         int err;
 
@@ -64,30 +64,26 @@ static struct file_system_type smfs_type = {
         .read_super  = smfs_read_super,
 };
 #else
-struct super_block *smfs_get_sb(struct file_system_type *fs_type, int flags, 
-                                const char *dev_name, void *data)
+struct super_block *smfs_get_super(struct file_system_type *fs_type,
+                                   int flags, const char *dev_name,
+                                   void *data)
 {
         return get_sb_nodev(fs_type, flags, data, smfs_fill_super);
 }
 
+void smfs_kill_super(struct super_block *sb)
+{
+        kill_anon_super(sb);
+}
+
 static struct file_system_type smfs_type = {
         .owner       = THIS_MODULE,
         .name        = "smfs",
-        .get_sb      = smfs_get_sb,
-        .kill_sb     = kill_anon_super,
+        .get_sb      = smfs_get_super,
+        .kill_sb     = smfs_kill_super,
 };
 #endif
 
-static int init_smfs(void)
-{
-        int err;
-
-        err = register_filesystem(&smfs_type);
-        if (err)
-                CERROR("register_filesystem() failed, rc = %d\n", err);
-        return err;
-}
-
 static int cleanup_smfs(void)
 {
         int err = 0;
@@ -98,6 +94,16 @@ static int cleanup_smfs(void)
         return 0;
 }
 
+static int init_smfs(void)
+{
+        int err;
+        
+        err = register_filesystem(&smfs_type);
+        if (err)
+                CERROR("register_filesystem() failed, rc = %d\n", err);
+        return err;
+}
+
 static int __init smfs_init(void)
 {
         int err;