Branch b1_4

Lustre fixes for compiling against a 2.6.12 kernel from Bull.
b=6864

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index d7758ad..3e1bbb3 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -180,6 +180,13 @@ out:
         RETURN(rc);
 }
 
+/* configure an RPC client OBD device
+ *
+ * lcfg parameters:
+ * 1 - client UUID
+ * 2 - server UUID
+ * 3 - inactive-on-startup
+ */
 int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
         struct lustre_cfg* lcfg = buf;
@@ -330,14 +337,14 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
                         GOTO(err_import, rc = -ENOSYS);
                 }
 
-                register_f = inter_module_get("mgmtcli_register_for_events");
+                register_f = PORTAL_SYMBOL_GET(mgmtcli_register_for_events);
                 if (!register_f) {
                         CERROR("can't i_m_g mgmtcli_register_for_events\n");
                         GOTO(err_import, rc = -ENOSYS);
                 }
 
                 rc = register_f(mgmt_obd, obddev, &imp->imp_target_uuid);
-                inter_module_put("mgmtcli_register_for_events");
+                PORTAL_SYMBOL_PUT(mgmtcli_register_for_events);
 
                 if (!rc)
                         cli->cl_mgmtcli_obd = mgmt_obd;
@@ -366,9 +373,9 @@ int client_obd_cleanup(struct obd_device *obddev)
         if (cli->cl_mgmtcli_obd) {
                 mgmtcli_deregister_for_events_t dereg_f;
 
-                dereg_f = inter_module_get("mgmtcli_deregister_for_events");
+                dereg_f = PORTAL_SYMBOL_GET(mgmtcli_deregister_for_events);
                 dereg_f(cli->cl_mgmtcli_obd, obddev);
-                inter_module_put("mgmtcli_deregister_for_events");
+                PORTAL_SYMBOL_PUT(mgmtcli_deregister_for_events);
         }
         class_destroy_import(cli->cl_import);
         cli->cl_import = NULL;