Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b83d51c0 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by NeilBrown
Browse files

md-cluster: init completion within lockres_init 



We should init completion within lockres_init, otherwise
completion could be initialized more than one time during
it's life cycle.

Reviewed-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 66099bb0

drivers/md/md-cluster.c

+1 −2
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ static int dlm_lock_sync(struct dlm_lock_resource *res, int mode) 
{

	int ret = 0;



	init_completion(&res->completion);

	ret = dlm_lock(res->ls, mode, &res->lksb,

			res->flags, res->name, strlen(res->name),

			0, sync_ast, res, res->bast);
@@ -125,6 +124,7 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev, 
	res = kzalloc(sizeof(struct dlm_lock_resource), GFP_KERNEL);

	if (!res)

		return NULL;

	init_completion(&res->completion);

	res->ls = cinfo->lockspace;

	res->mddev = mddev;

	namelen = strlen(name);
@@ -169,7 +169,6 @@ static void lockres_free(struct dlm_lock_resource *res) 
	if (!res)

		return;



	init_completion(&res->completion);

	dlm_unlock(res->ls, res->lksb.sb_lkid, 0, &res->lksb, res);

	wait_for_completion(&res->completion);