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

Commit a536e381 authored by David Teigland's avatar David Teigland
Browse files

dlm: ignore cancel on granted lock



Return immediately from dlm_unlock(CANCEL) if the lock is
granted and not being converted; there's nothing to cancel.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 43279e53
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -2186,6 +2186,13 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
			goto out;
		}

		/* there's nothing to cancel */
		if (lkb->lkb_status == DLM_LKSTS_GRANTED &&
		    !lkb->lkb_wait_type) {
			rv = -EBUSY;
			goto out;
		}

		switch (lkb->lkb_wait_type) {
		case DLM_MSG_LOOKUP:
		case DLM_MSG_REQUEST: