X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_layout.c;h=88ec0e6e18e4df723119e610a5aa092a009f1224;hp=87acec973690b526cb15b884ec376271c364f28f;hb=12e311012ae337276dc3e7da3e7ad8d85d11e764;hpb=219f7f582b387e9b303684381817be441bc12006

diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c
index 87acec9..88ec0e6 100644
--- a/lustre/lfsck/lfsck_layout.c
+++ b/lustre/lfsck/lfsck_layout.c
@@ -1358,8 +1358,7 @@ again:
 			break;
 
 		ltd->ltd_layout_gen = llmd->llmd_touch_gen;
-		list_del(&ltd->ltd_layout_phase_list);
-		list_add_tail(&ltd->ltd_layout_phase_list, head);
+		list_move_tail(&ltd->ltd_layout_phase_list, head);
 		atomic_inc(&ltd->ltd_ref);
 		laia->laia_ltd = ltd;
 		spin_unlock(&ltds->ltd_lock);
@@ -1567,9 +1566,8 @@ again:
 				break;
 
 			ltd->ltd_layout_gen = llmd->llmd_touch_gen;
-			list_del_init(&ltd->ltd_layout_phase_list);
-			list_add_tail(&ltd->ltd_layout_phase_list,
-				      &llmd->llmd_mdt_phase1_list);
+			list_move_tail(&ltd->ltd_layout_phase_list,
+				       &llmd->llmd_mdt_phase1_list);
 			atomic_inc(&ltd->ltd_ref);
 			laia->laia_ltd = ltd;
 			spin_unlock(&ltds->ltd_lock);
@@ -3976,9 +3974,8 @@ lfsck_layout_slave_query_master(const struct lu_env *env,
 			break;
 
 		llst->llst_gen = llsd->llsd_touch_gen;
-		list_del(&llst->llst_list);
-		list_add_tail(&llst->llst_list,
-			      &llsd->llsd_master_list);
+		list_move_tail(&llst->llst_list,
+			       &llsd->llsd_master_list);
 		atomic_inc(&llst->llst_ref);
 		spin_unlock(&llsd->llsd_lock);
 
@@ -4055,9 +4052,8 @@ lfsck_layout_slave_notify_master(const struct lu_env *env,
 			break;
 
 		llst->llst_gen = llsd->llsd_touch_gen;
-		list_del(&llst->llst_list);
-		list_add_tail(&llst->llst_list,
-			      &llsd->llsd_master_list);
+		list_move_tail(&llst->llst_list,
+			       &llsd->llsd_master_list);
 		atomic_inc(&llst->llst_ref);
 		spin_unlock(&llsd->llsd_lock);
 
@@ -4455,9 +4451,8 @@ static int lfsck_layout_prep(const struct lu_env *env,
 		if (!lfsck->li_drop_dryrun ||
 		    lo->ll_pos_first_inconsistent == 0) {
 			lo->ll_status = LS_SCANNING_PHASE2;
-			list_del_init(&com->lc_link);
-			list_add_tail(&com->lc_link,
-				      &lfsck->li_list_double_scan);
+			list_move_tail(&com->lc_link,
+				       &lfsck->li_list_double_scan);
 			pos->lp_oit_cookie = 0;
 		} else {
 			int i;
@@ -5023,20 +5018,17 @@ static int lfsck_layout_master_post(const struct lu_env *env,
 		lo->ll_status = LS_SCANNING_PHASE2;
 		lo->ll_flags |= LF_SCANNED_ONCE;
 		lo->ll_flags &= ~LF_UPGRADE;
-		list_del_init(&com->lc_link);
-		list_add_tail(&com->lc_link, &lfsck->li_list_double_scan);
+		list_move_tail(&com->lc_link, &lfsck->li_list_double_scan);
 	} else if (result == 0) {
 		lo->ll_status = lfsck->li_status;
 		if (lo->ll_status == 0)
 			lo->ll_status = LS_STOPPED;
 		if (lo->ll_status != LS_PAUSED) {
-			list_del_init(&com->lc_link);
-			list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+			list_move_tail(&com->lc_link, &lfsck->li_list_idle);
 		}
 	} else {
 		lo->ll_status = LS_FAILED;
-		list_del_init(&com->lc_link);
-		list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+		list_move_tail(&com->lc_link, &lfsck->li_list_idle);
 	}
 	spin_unlock(&lfsck->li_lock);
 
@@ -5085,20 +5077,16 @@ static int lfsck_layout_slave_post(const struct lu_env *env,
 			lo->ll_flags &= ~LF_CRASHED_LASTID;
 		}
 		lo->ll_flags &= ~LF_UPGRADE;
-		list_del_init(&com->lc_link);
-		list_add_tail(&com->lc_link, &lfsck->li_list_double_scan);
+		list_move_tail(&com->lc_link, &lfsck->li_list_double_scan);
 	} else if (result == 0) {
 		lo->ll_status = lfsck->li_status;
 		if (lo->ll_status == 0)
 			lo->ll_status = LS_STOPPED;
-		if (lo->ll_status != LS_PAUSED) {
-			list_del_init(&com->lc_link);
-			list_add_tail(&com->lc_link, &lfsck->li_list_idle);
-		}
+		if (lo->ll_status != LS_PAUSED)
+			list_move_tail(&com->lc_link, &lfsck->li_list_idle);
 	} else {
 		lo->ll_status = LS_FAILED;
-		list_del_init(&com->lc_link);
-		list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+		list_move_tail(&com->lc_link, &lfsck->li_list_idle);
 	}
 	spin_unlock(&lfsck->li_lock);