b=13733

r=vitaly,ericm
- fixes ASSERT failure in exp_connect_lru_resize if GSS is enabled

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 94add82..380c5f5 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1794,7 +1794,13 @@ int target_pack_pool_reply(struct ptlrpc_request *req)
 {
         struct ldlm_pool *pl;
         ENTRY;
-    
+   
+        if (req->rq_export == NULL) {
+                lustre_msg_set_slv(req->rq_repmsg, 0);
+                lustre_msg_set_limit(req->rq_repmsg, 0);
+                RETURN(0);
+        }
+ 
         if (!exp_connect_lru_resize(req->rq_export))
                 RETURN(0);
         

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 771ed62..6d4f672 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -957,6 +957,10 @@ int ldlm_cli_update_pool(struct ptlrpc_request *req)
         if (!imp_connect_lru_resize(req->rq_import))
                 RETURN(0);
 
+        if (lustre_msg_get_slv(req->rq_repmsg) == 0 ||
+            lustre_msg_get_limit(req->rq_repmsg) == 0)
+                RETURN(0);
+
         pl = ldlm_imp2pl(req->rq_import);
         
         spin_lock(&pl->pl_lock);