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

Commit 400cb454 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Shaohua Li
Browse files

md-cluster: use FORCEUNLOCK in lockres_free 



For dlm_unlock, we need to pass flag to dlm_unlock as the
third parameter instead of set res->flags.

Also, DLM_LKF_FORCEUNLOCK is more suitable for dlm_unlock
since it works even the lock is on waiting or convert queue.

Acked-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent e566aef1

drivers/md/md-cluster.c

+11 −15
Original line number Diff line number Diff line
@@ -194,24 +194,20 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev, 


static void lockres_free(struct dlm_lock_resource *res)

{

	int ret;

	int ret = 0;



	if (!res)

		return;



	/* cancel a lock request or a conversion request that is blocked */

	res->flags |= DLM_LKF_CANCEL;

retry:

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

	if (unlikely(ret != 0)) {

		pr_info("%s: failed to unlock %s return %d\n", __func__, res->name, ret);



		/* if a lock conversion is cancelled, then the lock is put

		 * back to grant queue, need to ensure it is unlocked */

		if (ret == -DLM_ECANCEL)

			goto retry;

	}

	res->flags &= ~DLM_LKF_CANCEL;

	/*

	 * use FORCEUNLOCK flag, so we can unlock even the lock is on the

	 * waiting or convert queue

	 */

	ret = dlm_unlock(res->ls, res->lksb.sb_lkid, DLM_LKF_FORCEUNLOCK,

		&res->lksb, res);

	if (unlikely(ret != 0))

		pr_err("failed to unlock %s return %d\n", res->name, ret);

	else

		wait_for_completion(&res->completion);



	kfree(res->name);