md-cluster: remove some unnecessary dlm_unlock_sync

GuoqingJiang · shligit · commit e3f924d3dfc6 · 2016-09-21T09:09:44.000-07:00
Since DLM_LKF_FORCEUNLOCK is used in lockres_free,
we don't need to call dlm_unlock_sync before free
lock resource.

Reviewed-by: NeilBrown &lt;neilb@suse.com&gt;
Signed-off-by: Guoqing Jiang &lt;gqjiang@suse.com&gt;
Signed-off-by: Shaohua Li &lt;shli@fb.com&gt;
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
@@ -284,7 +284,7 @@ static void recover_bitmaps(struct md_thread *thread)
 		ret = bitmap_copy_from_slot(mddev, slot, &lo, &hi, true);
 		if (ret) {
 			pr_err("md-cluster: Could not copy data from bitmap %d\n", slot);
-			goto dlm_unlock;
+			goto clear_bit;
 		}
 		if (hi > 0) {
 			if (lo < mddev->recovery_cp)
@@ -296,8 +296,6 @@ static void recover_bitmaps(struct md_thread *thread)
 			    md_wakeup_thread(mddev->thread);
 			}
 		}
-dlm_unlock:
-		dlm_unlock_sync(bm_lockres);
 clear_bit:
 		lockres_free(bm_lockres);
 		clear_bit(slot, &cinfo->recovery_map);
@@ -766,7 +764,6 @@ static int gather_all_resync_info(struct mddev *mddev, int total_slots)
 			md_check_recovery(mddev);
 		}
 
-		dlm_unlock_sync(bm_lockres);
 		lockres_free(bm_lockres);
 	}
 out:
@@ -1182,7 +1179,6 @@ static void unlock_all_bitmaps(struct mddev *mddev)
 	if (cinfo->other_bitmap_lockres) {
 		for (i = 0; i < mddev->bitmap_info.nodes - 1; i++) {
 			if (cinfo->other_bitmap_lockres[i]) {
-				dlm_unlock_sync(cinfo->other_bitmap_lockres[i]);
 				lockres_free(cinfo->other_bitmap_lockres[i]);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ static void recover_bitmaps(struct md_thread *thread)`
`284`	`284`	`ret = bitmap_copy_from_slot(mddev, slot, &lo, &hi, true);`
`285`	`285`	`if (ret) {`
`286`	`286`	`pr_err("md-cluster: Could not copy data from bitmap %d\n", slot);`
`287`		`- goto dlm_unlock;`
	`287`	`+ goto clear_bit;`
`288`	`288`	`}`
`289`	`289`	`if (hi > 0) {`
`290`	`290`	`if (lo < mddev->recovery_cp)`
`@@ -296,8 +296,6 @@ static void recover_bitmaps(struct md_thread *thread)`
`296`	`296`	`md_wakeup_thread(mddev->thread);`
`297`	`297`	`}`
`298`	`298`	`}`
`299`		`-dlm_unlock:`
`300`		`- dlm_unlock_sync(bm_lockres);`
`301`	`299`	`clear_bit:`
`302`	`300`	`lockres_free(bm_lockres);`
`303`	`301`	`clear_bit(slot, &cinfo->recovery_map);`
`@@ -766,7 +764,6 @@ static int gather_all_resync_info(struct mddev *mddev, int total_slots)`
`766`	`764`	`md_check_recovery(mddev);`
`767`	`765`	`}`
`768`	`766`
`769`		`- dlm_unlock_sync(bm_lockres);`
`770`	`767`	`lockres_free(bm_lockres);`
`771`	`768`	`}`
`772`	`769`	`out:`
`@@ -1182,7 +1179,6 @@ static void unlock_all_bitmaps(struct mddev *mddev)`
`1182`	`1179`	`if (cinfo->other_bitmap_lockres) {`
`1183`	`1180`	`for (i = 0; i < mddev->bitmap_info.nodes - 1; i++) {`
`1184`	`1181`	`if (cinfo->other_bitmap_lockres[i]) {`
`1185`		`- dlm_unlock_sync(cinfo->other_bitmap_lockres[i]);`
`1186`	`1182`	`lockres_free(cinfo->other_bitmap_lockres[i]);`
`1187`	`1183`	`}`
`1188`	`1184`	`}`