- compile fix.

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 36aad2a..e709a2e 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -359,7 +359,6 @@ static int ldlm_send_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock *new)
 {
         struct ldlm_lock_desc desc;
         struct ptlrpc_request *req = NULL;
-        struct ldlm_lock_desc desc;
         ENTRY;
 
 

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index fd5c89e..d8784ce 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -167,7 +167,7 @@ int ldlm_cli_callback(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
         }
 
         LDLM_DEBUG(lock, "server preparing %s AST",
-                   desc->l_req_mode = 0 ? "completion" : "blocked");
+                   desc->l_req_mode == 0 ? "completion" : "blocked");
 
         req->rq_replen = lustre_msg_size(0, NULL);