Commit 44637ca4 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: handle -EBUSY first in lock arg validation 



During lock arg validation, first check for -EBUSY cases, then for
-EINVAL cases. The -EINVAL checks look at lkb state variables
which are not stable when an lkb is busy and would cause an
-EBUSY result, e.g. lkb->lkb_grmode.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent eef6ec9b

fs/dlm/lock.c

+9 −9
Original line number Diff line number Diff line
@@ -2864,17 +2864,9 @@ static int set_unlock_args(uint32_t flags, void *astarg, struct dlm_args *args) 
static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,

			      struct dlm_args *args)

{

	int rv = -EINVAL;

	int rv = -EBUSY;



	if (args->flags & DLM_LKF_CONVERT) {

		if (lkb->lkb_flags & DLM_IFL_MSTCPY)

			goto out;



		if (args->flags & DLM_LKF_QUECVT &&

		    !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1])

			goto out;



		rv = -EBUSY;

		if (lkb->lkb_status != DLM_LKSTS_GRANTED)

			goto out;
@@ -2884,6 +2876,14 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, 


		if (is_overlap(lkb))

			goto out;



		rv = -EINVAL;

		if (lkb->lkb_flags & DLM_IFL_MSTCPY)

			goto out;



		if (args->flags & DLM_LKF_QUECVT &&

		    !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1])

			goto out;

	}



	lkb->lkb_exflags = args->flags;