X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_engine.c;h=f5b5e7005c8005eed919df3ab804a5d5e2e467b1;hp=97d0427635bce876f0d8e7cae1696b4e9dfb23e1;hb=445da16c2ac0475b1c1077c822800b68cdbb7ce3;hpb=bdb254df1060f1ad4b21d53396b5b4014c926758

diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c
index 97d0427..f5b5e70 100644
--- a/lustre/lfsck/lfsck_engine.c
+++ b/lustre/lfsck/lfsck_engine.c
@@ -1597,7 +1597,7 @@ int lfsck_assistant_engine(void *args)
 
 			if (unlikely(lad->lad_exit ||
 				     !thread_is_running(mthread)))
-				GOTO(cleanup1, rc = lad->lad_post_result);
+				GOTO(cleanup, rc = lad->lad_post_result);
 
 			lar = list_entry(lad->lad_req_list.next,
 					 struct lfsck_assistant_req,
@@ -1622,7 +1622,7 @@ int lfsck_assistant_engine(void *args)
 
 			lao->la_req_fini(env, lar);
 			if (rc < 0 && bk->lb_param & LPF_FAILOUT)
-				GOTO(cleanup1, rc);
+				GOTO(cleanup, rc);
 		}
 
 		l_wait_event(athread->t_ctl_waitq,
@@ -1633,7 +1633,7 @@ int lfsck_assistant_engine(void *args)
 			     &lwi);
 
 		if (unlikely(lad->lad_exit))
-			GOTO(cleanup1, rc = lad->lad_post_result);
+			GOTO(cleanup, rc = lad->lad_post_result);
 
 		if (!list_empty(&lad->lad_req_list))
 			continue;
@@ -1643,7 +1643,7 @@ int lfsck_assistant_engine(void *args)
 			       lfsck_lfsck2name(lfsck), lad->lad_name);
 
 			if (unlikely(lad->lad_exit))
-				GOTO(cleanup1, rc = lad->lad_post_result);
+				GOTO(cleanup, rc = lad->lad_post_result);
 
 			lad->lad_to_post = 0;
 			LASSERT(lad->lad_post_result > 0);
@@ -1687,7 +1687,7 @@ int lfsck_assistant_engine(void *args)
 			       lfsck_lfsck2name(lfsck), rc2);
 
 			if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_DOUBLESCAN))
-				GOTO(cleanup2, rc = 0);
+				GOTO(cleanup, rc = 0);
 
 			while (lad->lad_in_double_scan) {
 				rc = lfsck_assistant_query_others(env, com);
@@ -1695,7 +1695,7 @@ int lfsck_assistant_engine(void *args)
 					goto p2_next;
 
 				if (rc < 0)
-					GOTO(cleanup2, rc);
+					GOTO(cleanup, rc);
 
 				/* Pull LFSCK status on related targets once
 				 * per 30 seconds if we are not notified. */
@@ -1710,27 +1710,27 @@ int lfsck_assistant_engine(void *args)
 
 				if (unlikely(lad->lad_exit ||
 					     !thread_is_running(mthread)))
-					GOTO(cleanup2, rc = 0);
+					GOTO(cleanup, rc = 0);
 
 				if (rc == -ETIMEDOUT)
 					continue;
 
 				if (rc < 0)
-					GOTO(cleanup2, rc);
+					GOTO(cleanup, rc);
 
 p2_next:
 				rc = lao->la_handler_p2(env, com);
 				if (rc != 0)
-					GOTO(cleanup2, rc);
+					GOTO(cleanup, rc);
 
 				if (unlikely(lad->lad_exit ||
 					     !thread_is_running(mthread)))
-					GOTO(cleanup2, rc = 0);
+					GOTO(cleanup, rc = 0);
 			}
 		}
 	}
 
-cleanup1:
+cleanup:
 	/* Cleanup the unfinished requests. */
 	spin_lock(&lad->lad_lock);
 	if (rc < 0)
@@ -1739,6 +1739,7 @@ cleanup1:
 	if (lad->lad_exit && lad->lad_post_result <= 0)
 		lao->la_fill_pos(env, com, &lfsck->li_pos_checkpoint);
 
+	thread_set_flags(athread, SVC_STOPPING);
 	while (!list_empty(&lad->lad_req_list)) {
 		lar = list_entry(lad->lad_req_list.next,
 				 struct lfsck_assistant_req,
@@ -1754,7 +1755,6 @@ cleanup1:
 	LASSERTF(lad->lad_prefetched == 0, "unmatched prefeteched objs %d\n",
 		 lad->lad_prefetched);
 
-cleanup2:
 	memset(lr, 0, sizeof(*lr));
 	if (rc > 0) {
 		lr->lr_event = LE_PHASE2_DONE;