From: tianzy <tianzy>
Date: Tue, 25 Nov 2008 05:52:27 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_150~1^246~2
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ce55c2f8fc6b5beaf57105adf423f580e2ce78ee;p=fs%2Flustre-release.git

Branch b1_8_gate
change target_handle_dqacq_callback() error handling
b=16890
i=johann
i=panda
---

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 78a345b..e751371 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1979,8 +1979,8 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req)
         /* we use the observer */
         if (!obd->obd_observer || !obd->obd_observer->obd_observer) {
                 CERROR("Can't find the observer, it is recovering\n");
-                req->rq_status = -EIO;
-                GOTO(send_reply, rc = -EIO);
+                req->rq_status = -EAGAIN;
+                GOTO(send_reply, rc = -EAGAIN);
         }
 
         master_obd = obd->obd_observer->obd_observer;