Minor change for Linux 2.3

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

diff --git a/lustre/obdfs/super.c b/lustre/obdfs/super.c
index 7d61a06..cf60d54 100644 (file)
--- a/lustre/obdfs/super.c
+++ b/lustre/obdfs/super.c
@@ -25,15 +25,9 @@
 #include <linux/vmalloc.h>
 #include <asm/segment.h>
 
-#include <../obd/linux/sym_obd.h>
+#include <../obd/linux/sim_obd.h>
 #include <obdfs.h>
 
-/* DEBUGGING! */
-#undef MOD_INC_USE_COUNT
-#define MOD_INC_USE_COUNT
-#undef MOD_DEC_USE_COUNT
-#define MOD_DEC_USE_COUNT
-
 /* VFS super_block ops */
 static struct super_block *obdfs_read_super(struct super_block *, void *, int);
 static void obdfs_read_inode(struct inode *);
@@ -106,7 +100,7 @@ static struct super_block * obdfs_read_super(struct super_block *sb,
 
        printk("obdfs_read_super: rootinode is %ld dev %d\n", 
               root->i_ino, root->i_dev);
-       sb->s_root = d_alloc_root(root, NULL);
+       sb->s_root = d_alloc_root(root);
        unlock_super(sb);
        EXIT;  
         return sb;
@@ -281,6 +275,7 @@ void cleanup_module(void)
         ENTRY;
 
        obdfs_sysctl_clean();
+       unregister_filesystem(&obdfs_fs_type);
 }
 void obdfs_psdev_dec_use_count(void)
 {