From: bobijam <bobijam>
Date: Tue, 12 May 2009 01:37:12 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: v1_8_2_01~1^2~457
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=086fbf389d270e656d9bd9bf3a12f1a7a8d2738c;p=fs%2Flustre-release.git

Branch b1_8
b=13277
i=johann
i=Hongchao.zhang (zhanghc)

proper handle of memory shortage when ptlrpc_prep_set retuns NULL.
---

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index d2face5..7370a2c 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -1337,6 +1337,8 @@ int ldlm_run_bl_ast_work(struct list_head *rpc_list)
         ENTRY;
 
         arg.set = ptlrpc_prep_set();
+        if (NULL == arg.set)
+                RETURN(-ERESTART);
         atomic_set(&arg.restart, 0);
         arg.type = LDLM_BL_CALLBACK;
 
@@ -1394,6 +1396,8 @@ int ldlm_run_cp_ast_work(struct list_head *rpc_list)
         ENTRY;
 
         arg.set = ptlrpc_prep_set();
+        if (NULL == arg.set)
+                RETURN(-ERESTART);
         atomic_set(&arg.restart, 0);
         arg.type = LDLM_CP_CALLBACK;