LU-3068 build: fix 'incorrect expression' errors

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 026076b..117eb50 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -590,7 +590,6 @@ int lprocfs_rd_name(char *page, char **start, off_t off, int count,
         struct obd_device *dev = data;
 
         LASSERT(dev != NULL);
-        LASSERT(dev->obd_name != NULL);
         *eof = 1;
         return snprintf(page, count, "%s\n", dev->obd_name);
 }
@@ -974,6 +973,7 @@ static const char *obd_connect_names[] = {
        "nanoseconds_times",
        "lightweight_conn",
        "short_io",
+       "pingless",
        "unknown",
         NULL
 };
@@ -1057,6 +1057,9 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count,
                      cfs_atomic_read(&imp->imp_inval_count));
        spin_unlock(&imp->imp_lock);
 
+       if (obd->obd_svc_stats == NULL)
+               goto out_climp;
+
        header = &obd->obd_svc_stats->ls_cnt_header[PTLRPC_REQWAIT_CNTR];
         lprocfs_stats_collect(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR, &ret);
         if (ret.lc_count != 0) {
@@ -1136,6 +1139,7 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count,
                 }
         }
 
+out_climp:
         LPROCFS_CLIMP_EXIT(obd);
         return i;
 }
@@ -1317,9 +1321,8 @@ EXPORT_SYMBOL(lprocfs_obd_cleanup);
 
 static void lprocfs_free_client_stats(struct nid_stat *client_stat)
 {
-        CDEBUG(D_CONFIG, "stat %p - data %p/%p/%p\n", client_stat,
-               client_stat->nid_proc, client_stat->nid_stats,
-               client_stat->nid_brw_stats);
+       CDEBUG(D_CONFIG, "stat %p - data %p/%p\n", client_stat,
+              client_stat->nid_proc, client_stat->nid_stats);
 
         LASSERTF(cfs_atomic_read(&client_stat->nid_exp_ref_count) == 0,
                  "nid %s:count %d\n", libcfs_nid2str(client_stat->nid),
@@ -1331,9 +1334,6 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat)
         if (client_stat->nid_stats)
                 lprocfs_free_stats(&client_stat->nid_stats);
 
-        if (client_stat->nid_brw_stats)
-                OBD_FREE_PTR(client_stat->nid_brw_stats);
-
         if (client_stat->nid_ldlm_stats)
                 lprocfs_free_stats(&client_stat->nid_ldlm_stats);
 
@@ -1787,7 +1787,7 @@ do {                                                                    \
 void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats)
 {
         LPROCFS_MD_OP_INIT(num_private_stats, stats, getstatus);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, change_cbdata);
+        LPROCFS_MD_OP_INIT(num_private_stats, stats, null_inode);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, find_cbdata);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, close);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, create);
@@ -1999,7 +1999,6 @@ EXPORT_SYMBOL(lprocfs_nid_stats_clear_read);
 static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
 {
         struct nid_stat *stat = obj;
-        int i;
         ENTRY;
 
         CDEBUG(D_INFO,"refcnt %d\n", cfs_atomic_read(&stat->nid_exp_ref_count));
@@ -2014,10 +2013,6 @@ static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
         if (stat->nid_stats)
                 lprocfs_clear_stats(stat->nid_stats);
 
-        if (stat->nid_brw_stats) {
-                for (i = 0; i < BRW_LAST; i++)
-                        lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]);
-        }
         RETURN(0);
 }