From edab4064b28b36aa7a0be6ca4ffa68d32058d6c6 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Mon, 23 Feb 2004 13:58:56 +0000
Subject: [PATCH] module's init function will not get called when loading in
2.6.
---
lustre/include/linux/lustre_compat25.h | 2 ++
lustre/lvfs/lvfs_linux.c | 9 ---------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index e6339dcde7..a1fb3dca47 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -38,8 +38,10 @@
* initialization routines must be called after device
* driver initialization
*/
+#ifndef MODULE
#undef module_init
#define module_init(a) late_initcall(a)
+#endif
/* XXX our code should be using the 2.6 calls, not the other way around */
#define TryLockPage(page) TestSetPageLocked(page)
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index 935548e763..2855b52c53 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -352,8 +352,6 @@ EXPORT_SYMBOL(l_readdir);
EXPORT_SYMBOL(obd_memory);
EXPORT_SYMBOL(obd_memmax);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-
static int __init lvfs_linux_init(void)
{
RETURN(0);
@@ -377,10 +375,3 @@ MODULE_LICENSE("GPL");
module_init(lvfs_linux_init);
module_exit(lvfs_linux_exit);
-
-#else
-
-#warning "lvfs_linux_init() and fsfilt_ext3_exit() aren't called on 2.6. MUST be fixed"
-
-
-#endif
--
GitLab