Commit 95a9cd32 authored by Henri Doreau's avatar Henri Doreau Committed by Greg Kroah-Hartman
Browse files

staging: lustre: nrs: serialize executions of nrs_policy_stop 



Do not release nrs_lock in nrs_policy_stop0 to prevent op_policy_stop()
from being executed concurrently.

Signed-off-by: default avatarHenri Doreau <henri.doreau@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7096
Reviewed-on: http://review.whamcloud.com/16214


Reviewed-by: default avatarLai Siyao <lai.siyao@intel.com>
Reviewed-by: default avatarEmoly Liu <emoly.liu@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7f651ad

drivers/staging/lustre/lustre/ptlrpc/nrs.c

+3 −13
Original line number Diff line number Diff line
@@ -82,16 +82,9 @@ static int nrs_policy_ctl_locked(struct ptlrpc_nrs_policy *policy, 


static void nrs_policy_stop0(struct ptlrpc_nrs_policy *policy)

{

	struct ptlrpc_nrs *nrs = policy->pol_nrs;



	if (policy->pol_desc->pd_ops->op_policy_stop) {

		spin_unlock(&nrs->nrs_lock);



	if (policy->pol_desc->pd_ops->op_policy_stop)

		policy->pol_desc->pd_ops->op_policy_stop(policy);



		spin_lock(&nrs->nrs_lock);

	}



	LASSERT(list_empty(&policy->pol_list_queued));

	LASSERT(policy->pol_req_queued == 0 &&

		policy->pol_req_started == 0);
@@ -619,11 +612,8 @@ static int nrs_policy_ctl(struct ptlrpc_nrs *nrs, char *name, 
		goto out;

	}



	/**

	 * Wait for the policy to be fully started before attempting

	 * to operate it.

	 */

	if (policy->pol_state == NRS_POL_STATE_STARTING) {

	if (policy->pol_state != NRS_POL_STATE_STARTED &&

	    policy->pol_state != NRS_POL_STATE_STOPPED) {

		rc = -EAGAIN;

		goto out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE