Branch b1_4_newconfig2

b=6663
resolve mgc symbols

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 9aee0f1..8421b79 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -46,8 +46,8 @@
 #include <linux/lustre_log.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_disk.h>
-#include <linux/lustre_net.h>
 //#include <linux/lprocfs_status.h>
+
 #include "mgc_internal.h"
 
           
@@ -560,10 +560,7 @@ struct obd_ops mgc_obd_ops = {
 
 int __init mgc_init(void)
 {
-        struct lprocfs_static_vars lvars;
-        lprocfs_init_vars(mgc, &lvars);
-        return class_register_type(&mgc_obd_ops, lvars.module_vars,
-                                   LUSTRE_MGC_NAME);
+        return class_register_type(&mgc_obd_ops, NULL, LUSTRE_MGC_NAME);
 }
 
 #ifdef __KERNEL__

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 0b0ebf5..8377af4 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -21,6 +21,11 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+
 #ifdef __KERNEL__
 # include <linux/config.h>
 # include <linux/module.h>
@@ -88,6 +93,7 @@ int ptlrpc_init_import(struct obd_import *imp)
 
         return 0;
 }
+EXPORT_SYMBOL(ptlrpc_init_import);
 
 #define UUID_STR "_UUID"
 static void deuuidify(char *uuid, const char *prefix, char **uuid_start, int *uuid_len)
@@ -377,6 +383,7 @@ out:
 
         RETURN(rc);
 }
+EXPORT_SYMBOL(ptlrpc_connect_import);
 
 static void ptlrpc_maybe_ping_import_soon(struct obd_import *imp)
 {