LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec

[fs/lustre-release.git] / lustre / ptlrpc / nrs.c

diff --git a/lustre/ptlrpc/nrs.c b/lustre/ptlrpc/nrs.c
index 8d637f3..52d3225 100644 (file)
--- 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
  */
@@ -292,6 +292,8 @@ static int nrs_policy_start_locked(struct ptlrpc_nrs_policy *policy, char *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;
@@ -1811,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);