LU-3068 build: fix 'incorrect expression' errors

[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..c68bcaf 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;
 
@@ -1022,8 +1023,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",