LU-3534 osp: send updates by separate thread

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

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 2c288c2..cb80676 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1732,7 +1732,6 @@ static int check_for_next_transno(struct lu_target *lut)
 
        if (lut->lut_tdtd != NULL) {
                struct target_distribute_txn_data *tdtd;
-               __u64 update_transno;
 
                tdtd = lut->lut_tdtd;
                update_transno = distribute_txn_get_next_transno(lut->lut_tdtd);
@@ -1754,8 +1753,8 @@ static int check_for_next_transno(struct lu_target *lut)
        } else if (obd->obd_recovery_expired) {
                CDEBUG(D_HA, "waking for expired recovery\n");
                wake_up = 1;
-       } else if (req_transno == next_transno || (update_transno != 0 &&
-                                          update_transno <= next_transno)) {
+       } else if (req_transno == next_transno ||
+                  (update_transno != 0 && update_transno <= next_transno)) {
                CDEBUG(D_HA, "waking for next ("LPD64")\n", next_transno);
                wake_up = 1;
        } else if (queue_len > 0 &&
@@ -2263,7 +2262,7 @@ static void replay_request_or_update(struct lu_env *env,
                                obd->obd_next_recovery_transno = transno;
                        spin_unlock(&obd->obd_recovery_task_lock);
                        target_update_lcd(env, lut, dtrq);
-                       dtrq_destory(dtrq);
+                       dtrq_destroy(dtrq);
                } else {
                        spin_unlock(&obd->obd_recovery_task_lock);
                        LASSERT(list_empty(&obd->obd_req_replay_queue));