b=18551 adapt ldlm_namespace to new cfs_hash

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 5530278..b49c28a 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -214,6 +214,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         struct obd_uuid server_uuid;
         int rq_portal, rp_portal, connect_op;
         char *name = obddev->obd_type->typ_name;
+        ldlm_ns_type_t ns_type = LDLM_NS_TYPE_UNKNOWN;
         int rc;
         ENTRY;
 
@@ -225,12 +226,16 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
                 connect_op = OST_CONNECT;
                 cli->cl_sp_me = LUSTRE_SP_CLI;
                 cli->cl_sp_to = LUSTRE_SP_OST;
+                ns_type = LDLM_NS_TYPE_OSC;
+
         } else if (!strcmp(name, LUSTRE_MDC_NAME)) {
                 rq_portal = MDS_REQUEST_PORTAL;
                 rp_portal = MDC_REPLY_PORTAL;
                 connect_op = MDS_CONNECT;
                 cli->cl_sp_me = LUSTRE_SP_CLI;
                 cli->cl_sp_to = LUSTRE_SP_MDT;
+                ns_type = LDLM_NS_TYPE_MDC;
+
         } else if (!strcmp(name, LUSTRE_MGC_NAME)) {
                 rq_portal = MGS_REQUEST_PORTAL;
                 rp_portal = MGC_REPLY_PORTAL;
@@ -238,6 +243,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
                 cli->cl_sp_me = LUSTRE_SP_MGC;
                 cli->cl_sp_to = LUSTRE_SP_MGS;
                 cli->cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_INVALID;
+                ns_type = LDLM_NS_TYPE_MGC;
+
         } else {
                 CERROR("unknown client OBD type \"%s\", can't setup\n",
                        name);
@@ -366,7 +373,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
 
         obddev->obd_namespace = ldlm_namespace_new(obddev, obddev->obd_name,
                                                    LDLM_NAMESPACE_CLIENT,
-                                                   LDLM_NAMESPACE_GREEDY);
+                                                   LDLM_NAMESPACE_GREEDY,
+                                                   ns_type);
         if (obddev->obd_namespace == NULL) {
                 CERROR("Unable to create client namespace - %s\n",
                        obddev->obd_name);