Commit 9ac8ba46 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: handle -EINVAL as log_error() 



If the user generates -EINVAL it's probably because they are
using DLM incorrectly.  Change the log level to make these
errors more visible.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent c2d76a62

fs/dlm/lock.c

+30 −2
Original line number Diff line number Diff line
@@ -2900,11 +2900,25 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, 
#endif

	rv = 0;

 out:

	if (rv)

	switch (rv) {

	case 0:

		break;

	case -EINVAL:

		/* annoy the user because dlm usage is wrong */

		WARN_ON(1);

		log_error(ls, "%s %d %x %x %x %d %d %s", __func__,

			  rv, lkb->lkb_id, lkb->lkb_flags, args->flags,

			  lkb->lkb_status, lkb->lkb_wait_type,

			  lkb->lkb_resource->res_name);

		break;

	default:

		log_debug(ls, "%s %d %x %x %x %d %d %s", __func__,

			  rv, lkb->lkb_id, lkb->lkb_flags, args->flags,

			  lkb->lkb_status, lkb->lkb_wait_type,

			  lkb->lkb_resource->res_name);

		break;

	}



	return rv;

}
@@ -3037,11 +3051,25 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args) 
	lkb->lkb_astparam = args->astparam;

	rv = 0;

 out:

	if (rv)

	switch (rv) {

	case 0:

		break;

	case -EINVAL:

		/* annoy the user because dlm usage is wrong */

		WARN_ON(1);

		log_error(ls, "%s %d %x %x %x %x %d %s", __func__, rv,

			  lkb->lkb_id, lkb->lkb_flags, lkb->lkb_exflags,

			  args->flags, lkb->lkb_wait_type,

			  lkb->lkb_resource->res_name);

		break;

	default:

		log_debug(ls, "%s %d %x %x %x %x %d %s", __func__, rv,

			  lkb->lkb_id, lkb->lkb_flags, lkb->lkb_exflags,

			  args->flags, lkb->lkb_wait_type,

			  lkb->lkb_resource->res_name);

		break;

	}



	return rv;

}