diff options
| author | Guoqing Jiang <gqjiang@suse.com> | 2016-08-12 07:42:36 +0200 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-09-21 18:09:44 +0200 |
| commit | e3f924d3dfc672dd1292bc7eb6f2a305c13981ec (patch) | |
| tree | 3a1413a1a0736231449c076771f72cd15b6ae595 /drivers | |
| parent | md-cluster: use FORCEUNLOCK in lockres_free (diff) | |
| download | linux-e3f924d3dfc672dd1292bc7eb6f2a305c13981ec.tar.xz linux-e3f924d3dfc672dd1292bc7eb6f2a305c13981ec.zip | |
md-cluster: remove some unnecessary dlm_unlock_sync
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 <neilb@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/md-cluster.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index ccd756fdc00e..67a735840639 100644 --- 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]); } } |