LU-398 ptlrpc: NRS framework follow-up patch

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

diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index ad4777c..52af507 100644 (file)
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -101,6 +101,7 @@ struct ll_rpc_opcode {
        { MDS_HSM_REQUEST,  "mds_hsm_request" },
        { MDS_HSM_CT_REGISTER, "mds_hsm_ct_register" },
        { MDS_HSM_CT_UNREGISTER, "mds_hsm_ct_unregister" },
+       { MDS_SWAP_LAYOUTS,     "mds_swap_layouts" },
         { LDLM_ENQUEUE,     "ldlm_enqueue" },
         { LDLM_CONVERT,     "ldlm_convert" },
         { LDLM_CANCEL,      "ldlm_cancel" },
@@ -134,7 +135,8 @@ struct ll_rpc_opcode {
         { SEC_CTX_INIT,     "sec_ctx_init" },
         { SEC_CTX_INIT_CONT,"sec_ctx_init_cont" },
         { SEC_CTX_FINI,     "sec_ctx_fini" },
-        { FLD_QUERY,        "fld_query" }
+       { FLD_QUERY,        "fld_query" },
+       { UPDATE_OBJ,       "update_obj" },
 };
 
 struct ll_eopcode {
@@ -368,7 +370,6 @@ ptlrpc_lprocfs_rd_threads_started(char *page, char **start, off_t off,
        int     total = 0;
        int     i;
 
-       LASSERT(svc->srv_parts != NULL);
        ptlrpc_service_for_each_part(svcpt, i, svc)
                total += svcpt->scp_nthrs_running;
 
@@ -423,16 +424,13 @@ extern struct nrs_core nrs_core;
  *
  * \param[in] state The policy state
  */
-static const char *
-nrs_state2str(enum ptlrpc_nrs_pol_state state)
+static const char *nrs_state2str(enum ptlrpc_nrs_pol_state state)
 {
        switch (state) {
        default:
                LBUG();
        case NRS_POL_STATE_INVALID:
                return "invalid";
-       case NRS_POL_STATE_UNAVAIL:
-               return "unavail";
        case NRS_POL_STATE_STOPPED:
                return "stopped";
        case NRS_POL_STATE_STOPPING:
@@ -452,15 +450,14 @@ nrs_state2str(enum ptlrpc_nrs_pol_state state)
  * \param[in] policy The policy
  * \param[out] info  Holds returned status information
  */
-void
-nrs_policy_get_info_locked(struct ptlrpc_nrs_policy *policy,
-                          struct ptlrpc_nrs_pol_info *info)
+void nrs_policy_get_info_locked(struct ptlrpc_nrs_policy *policy,
+                               struct ptlrpc_nrs_pol_info *info)
 {
        LASSERT(policy != NULL);
        LASSERT(info != NULL);
        LASSERT(spin_is_locked(&policy->pol_nrs->nrs_lock));
 
-       memcpy(info->pi_name, policy->pol_name, NRS_POL_NAME_MAX);
+       memcpy(info->pi_name, policy->pol_desc->pd_name, NRS_POL_NAME_MAX);
 
        info->pi_fallback    = !!(policy->pol_flags & PTLRPC_NRS_FL_FALLBACK);
        info->pi_state       = policy->pol_state;
@@ -476,9 +473,8 @@ nrs_policy_get_info_locked(struct ptlrpc_nrs_policy *policy,
  * Reads and prints policy status information for all policies of a PTLRPC
  * service.
  */
-static int
-ptlrpc_lprocfs_rd_nrs(char *page, char **start, off_t off,
-                     int count, int *eof, void *data)
+static int ptlrpc_lprocfs_rd_nrs(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
 {
        struct ptlrpc_service          *svc = data;
        struct ptlrpc_service_part     *svcpt;
@@ -661,9 +657,8 @@ out:
  * if the optional token is omitted, the operation is performed on both the
  * regular and high-priority (if the service has one) NRS head.
  */
-static int
-ptlrpc_lprocfs_wr_nrs(struct file *file, const char *buffer,
-                     unsigned long count, void *data)
+static int ptlrpc_lprocfs_wr_nrs(struct file *file, const char *buffer,
+                                unsigned long count, void *data)
 {
        struct ptlrpc_service          *svc = data;
        enum ptlrpc_nrs_queue_type      queue = PTLRPC_NRS_QUEUE_BOTH;
@@ -1022,8 +1017,6 @@ static int ptlrpc_lprocfs_rd_timeouts(char *page, char **start, off_t off,
        int                             rc = 0;
        int                             i;
 
-       LASSERT(svc->srv_parts != NULL);
-
        if (AT_OFF) {
                rc += snprintf(page + rc, count - rc,
                               "adaptive timeouts off, using obd_timeout %u\n",