X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Ftarget.c;h=e7ea1f555dcbc3a096f17e1c79de256ddd6d808d;hb=dea1dfafba827572dc1be042de4332e8962f1c14;hp=245c9dc6765b5e9e6a85bbad92127a1be31ab9e2;hpb=049b0a621a9bb4186af11aea4ebd9c6430052f13;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/target.c b/lustre/ptlrpc/target.c
index 245c9dc..e7ea1f5 100644
--- a/lustre/ptlrpc/target.c
+++ b/lustre/ptlrpc/target.c
@@ -122,9 +122,9 @@ static void obt_boot_epoch_update(struct lu_target *lut)
         cfs_spin_unlock(&lut->lut_translock);
 
         CFS_INIT_LIST_HEAD(&client_list);
-        cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+        cfs_spin_lock(&obd->obd_recovery_task_lock);
         cfs_list_splice_init(&obd->obd_final_req_queue, &client_list);
-        cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+        cfs_spin_unlock(&obd->obd_recovery_task_lock);
 
         /**
          * go through list of exports participated in recovery and
@@ -135,9 +135,9 @@ static void obt_boot_epoch_update(struct lu_target *lut)
                 obt_client_epoch_update(req->rq_export);
         }
         /** return list back at once */
-        cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+        cfs_spin_lock(&obd->obd_recovery_task_lock);
         cfs_list_splice_init(&client_list, &obd->obd_final_req_queue);
-        cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+        cfs_spin_unlock(&obd->obd_recovery_task_lock);
         obt_server_data_update(lut, 1);
 }
 
@@ -293,7 +293,7 @@ void lut_boot_epoch_update(struct lu_target *lut)
 
         rc = lu_env_init(&env, LCT_DT_THREAD);
         if (rc) {
-                CERROR("Can't initialize environment rc=%i\n", rc);
+                CERROR("Can't initialize environment rc=%d\n", rc);
                 return;
         }
 
@@ -308,9 +308,9 @@ void lut_boot_epoch_update(struct lu_target *lut)
          * The recovery is not yet finished and final queue can still be updated
          * with resend requests. Move final list to separate one for processing
          */
-        cfs_spin_lock_bh(&lut->lut_obd->obd_processing_task_lock);
+        cfs_spin_lock(&lut->lut_obd->obd_recovery_task_lock);
         cfs_list_splice_init(&lut->lut_obd->obd_final_req_queue, &client_list);
-        cfs_spin_unlock_bh(&lut->lut_obd->obd_processing_task_lock);
+        cfs_spin_unlock(&lut->lut_obd->obd_recovery_task_lock);
 
         /**
          * go through list of exports participated in recovery and
@@ -322,9 +322,9 @@ void lut_boot_epoch_update(struct lu_target *lut)
                         lut_client_epoch_update(&env, req->rq_export);
         }
         /** return list back at once */
-        cfs_spin_lock_bh(&lut->lut_obd->obd_processing_task_lock);
+        cfs_spin_lock(&lut->lut_obd->obd_recovery_task_lock);
         cfs_list_splice_init(&client_list, &lut->lut_obd->obd_final_req_queue);
-        cfs_spin_unlock_bh(&lut->lut_obd->obd_processing_task_lock);
+        cfs_spin_unlock(&lut->lut_obd->obd_recovery_task_lock);
         /** update server epoch */
         lut_server_data_update(&env, lut, 1);
         lu_env_fini(&env);