X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs.c;h=52d3225deba6bb7ed1c7193cd87539cc3931b846;hp=96ca9f2ca7c85504d32a60fe493b77bd27777a2d;hb=917655fc2938b90a9c246dd2d58408c42aa1658d;hpb=d4db3f18e523256f6c562a8993332f7fb7d70486

diff --git a/lustre/ptlrpc/nrs.c b/lustre/ptlrpc/nrs.c
index 96ca9f2..52d3225 100644
--- a/lustre/ptlrpc/nrs.c
+++ b/lustre/ptlrpc/nrs.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
  *
  * Copyright 2012 Xyratex Technology Limited
  */
@@ -86,17 +86,11 @@ 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;
 	ENTRY;
 
-	if (policy->pol_desc->pd_ops->op_policy_stop != NULL) {
-		spin_unlock(&nrs->nrs_lock);
-
+	if (policy->pol_desc->pd_ops->op_policy_stop != NULL)
 		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);
@@ -270,14 +264,6 @@ static int nrs_policy_start_locked(struct ptlrpc_nrs_policy *policy, char *arg)
 		RETURN(-ENODEV);
 	}
 
-	if (arg != NULL) {
-		if (strlen(arg) + 1 > sizeof(policy->pol_arg)) {
-			CERROR("NRS: arg '%s' is too long\n", arg);
-			GOTO(out, rc = -E2BIG);
-		}
-		strncpy(policy->pol_arg, arg, sizeof(policy->pol_arg));
-	}
-
 	/**
 	 * Serialize policy starting across the NRS head
 	 */
@@ -300,6 +286,16 @@ static int nrs_policy_start_locked(struct ptlrpc_nrs_policy *policy, char *arg)
 		}
 	}
 
+	if (arg != NULL) {
+		if (strlcpy(policy->pol_arg, arg, sizeof(policy->pol_arg)) >=
+		    sizeof(policy->pol_arg)) {
+			CERROR("NRS: arg '%s' is too long\n", arg);
+			GOTO(out, rc = -E2BIG);
+		}
+	} else {
+		policy->pol_arg[0] = '\0';
+	}
+
 	policy->pol_state = NRS_POL_STATE_STARTED;
 
 	if (policy->pol_flags & PTLRPC_NRS_FL_FALLBACK) {
@@ -671,11 +667,8 @@ static int nrs_policy_ctl(struct ptlrpc_nrs *nrs, char *name,
 	if (policy == NULL)
 		GOTO(out, rc = -ENOENT);
 
-	/**
-	 * 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)
 		GOTO(out, rc = -EAGAIN);
 
 	switch (opc) {
@@ -1820,6 +1813,10 @@ int ptlrpc_nrs_init(void)
 	rc = ptlrpc_nrs_policy_register(&nrs_conf_tbf);
 	if (rc != 0)
 		GOTO(fail, rc);
+
+	rc = ptlrpc_nrs_policy_register(&nrs_conf_delay);
+	if (rc != 0)
+		GOTO(fail, rc);
 #endif /* HAVE_SERVER_SUPPORT */
 
 	RETURN(rc);