LU-3319 lprocfs: client side cleanups

[fs/lustre-release.git] / lustre / mgc / lproc_mgc.c

diff --git a/lustre/mgc/lproc_mgc.c b/lustre/mgc/lproc_mgc.c
index da974d8..f818def 100644 (file)
--- a/lustre/mgc/lproc_mgc.c
+++ b/lustre/mgc/lproc_mgc.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,26 +43,39 @@
 
 #ifdef LPROCFS
 
-static struct lprocfs_vars lprocfs_mgc_obd_vars[] = {
-        { "uuid",            lprocfs_rd_uuid,          0, 0 },
-        { "ping",            0, lprocfs_wr_ping,       0, 0, 0222 },
-        { "connect_flags",   lprocfs_rd_connect_flags, 0, 0 },
-        { "mgs_server_uuid", lprocfs_rd_server_uuid,   0, 0 },
-        { "mgs_conn_uuid",   lprocfs_rd_conn_uuid,     0, 0 },
-        { "import",          lprocfs_rd_import,        0, 0 },
-        { "state",           lprocfs_rd_state,         0, 0 },
-        { "ir_state",        lprocfs_mgc_rd_ir_state,  0, 0 },
-        { 0 }
-};
+LPROC_SEQ_FOPS_RO_TYPE(mgc, uuid);
+LPROC_SEQ_FOPS_RO_TYPE(mgc, connect_flags);
+LPROC_SEQ_FOPS_RO_TYPE(mgc, server_uuid);
+LPROC_SEQ_FOPS_RO_TYPE(mgc, conn_uuid);
+LPROC_SEQ_FOPS_RO_TYPE(mgc, import);
+LPROC_SEQ_FOPS_RO_TYPE(mgc, state);
 
-static struct lprocfs_vars lprocfs_mgc_module_vars[] = {
-        { "num_refs",        lprocfs_rd_numrefs,       0, 0 },
-        { 0 }
-};
+LPROC_SEQ_FOPS_WO_TYPE(mgc, ping);
 
-void lprocfs_mgc_init_vars(struct lprocfs_static_vars *lvars)
+static int mgc_ir_state_seq_show(struct seq_file *m, void *v)
 {
-        lvars->module_vars = lprocfs_mgc_module_vars;
-        lvars->obd_vars    = lprocfs_mgc_obd_vars;
+       return lprocfs_mgc_rd_ir_state(m, m->private);
 }
+LPROC_SEQ_FOPS_RO(mgc_ir_state);
+
+struct lprocfs_seq_vars lprocfs_mgc_obd_vars[] = {
+       { .name =       "uuid",
+         .fops =       &mgc_uuid_fops          },
+       { .name =       "ping",
+         .fops =       &mgc_ping_fops,
+         .proc_mode =  0222                    },
+       { .name =       "connect_flags",
+         .fops =       &mgc_connect_flags_fops },
+       { .name =       "mgs_server_uuid",
+         .fops =       &mgc_server_uuid_fops   },
+       { .name =       "mgs_conn_uuid",
+         .fops =       &mgc_conn_uuid_fops     },
+       { .name =       "import",
+         .fops =       &mgc_import_fops        },
+       { .name =       "state",
+         .fops =       &mgc_state_fops         },
+       { .name =       "ir_state",
+         .fops =       &mgc_ir_state_fops      },
+       { 0 }
+};
 #endif /* LPROCFS */