qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

md-cluster: fix missing memory free 

There are several places we allocate dlm_lock_resource, but not free it.

leave() need free a lock resource too (from Guoqing)
Cc: Goldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Guoqing Jiang <gqjiang@suse.com>
Cc: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
Shaohua Li 2016-01-22 15:54:42 -08:00
parent 6a84f57241
commit 4ac7a65f80
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/md-cluster.c
View File

@ -293,6 +293,7 @@ static void recover_bitmaps(struct md_thread *thread)
dlm_unlock: dlm_unlock:
dlm_unlock_sync(bm_lockres); dlm_unlock_sync(bm_lockres);
clear_bit: clear_bit:
lockres_free(bm_lockres);
clear_bit(slot, &cinfo->recovery_map); clear_bit(slot, &cinfo->recovery_map);
} }
} }
@ -682,8 +683,10 @@ static int gather_all_resync_info(struct mddev *mddev, int total_slots)
bm_lockres = lockres_init(mddev, str, NULL, 1); bm_lockres = lockres_init(mddev, str, NULL, 1);
if (!bm_lockres) if (!bm_lockres)
return -ENOMEM; return -ENOMEM;
if (i == (cinfo->slot_number - 1)) if (i == (cinfo->slot_number - 1)) {
lockres_free(bm_lockres);
continue; continue;
}
bm_lockres->flags |= DLM_LKF_NOQUEUE; bm_lockres->flags |= DLM_LKF_NOQUEUE;
ret = dlm_lock_sync(bm_lockres, DLM_LOCK_PW); ret = dlm_lock_sync(bm_lockres, DLM_LOCK_PW);
@ -858,6 +861,7 @@ static int leave(struct mddev *mddev)
lockres_free(cinfo->token_lockres); lockres_free(cinfo->token_lockres);
lockres_free(cinfo->ack_lockres); lockres_free(cinfo->ack_lockres);
lockres_free(cinfo->no_new_dev_lockres); lockres_free(cinfo->no_new_dev_lockres);
lockres_free(cinfo->resync_lockres);
lockres_free(cinfo->bitmap_lockres); lockres_free(cinfo->bitmap_lockres);
unlock_all_bitmaps(mddev); unlock_all_bitmaps(mddev);
dlm_release_lockspace(cinfo->lockspace, 2); dlm_release_lockspace(cinfo->lockspace, 2);