Whamcloud - gitweb
LU-6070 libcfs: provide separate buffers for libcfs_*2str()
[fs/lustre-release.git] / lustre / obdclass / lprocfs_status_server.c
index 10e0cd3..290e4e5 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,8 +38,9 @@
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
+#include <lustre_nodemap.h>
 
 
-#if defined(LPROCFS)
+#ifdef CONFIG_PROC_FS
 
 int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 {
 
 int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 {
@@ -101,76 +102,6 @@ out:
 }
 EXPORT_SYMBOL(lprocfs_evict_client_seq_write);
 
 }
 EXPORT_SYMBOL(lprocfs_evict_client_seq_write);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_wr_evict_client(struct file *file, const char __user *buffer,
-                           unsigned long count, void *data)
-{
-       struct obd_device *obd = data;
-       char              *kbuf;
-       char              *tmpbuf;
-
-       OBD_ALLOC(kbuf, BUFLEN);
-       if (kbuf == NULL)
-               return -ENOMEM;
-
-       /*
-        * OBD_ALLOC() will zero kbuf, but we only copy BUFLEN - 1
-        * bytes into kbuf, to ensure that the string is NUL-terminated.
-        * UUID_MAX should include a trailing NUL already.
-        */
-       if (copy_from_user(kbuf, buffer,
-                          min_t(unsigned long, BUFLEN - 1, count))) {
-               count = -EFAULT;
-               goto out;
-       }
-       tmpbuf = cfs_firststr(kbuf, min_t(unsigned long, BUFLEN - 1, count));
-       class_incref(obd, __func__, current);
-
-       if (strncmp(tmpbuf, "nid:", 4) == 0)
-               obd_export_evict_by_nid(obd, tmpbuf + 4);
-       else if (strncmp(tmpbuf, "uuid:", 5) == 0)
-               obd_export_evict_by_uuid(obd, tmpbuf + 5);
-       else
-               obd_export_evict_by_uuid(obd, tmpbuf);
-
-       class_decref(obd, __func__, current);
-out:
-       OBD_FREE(kbuf, BUFLEN);
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_wr_evict_client);
-
-const struct file_operations lprocfs_evict_client_fops = {
-       .owner = THIS_MODULE,
-       .read = lprocfs_fops_read,
-       .write = lprocfs_fops_write,
-       .open = lprocfs_evict_client_open,
-       .release = lprocfs_evict_client_release,
-};
-EXPORT_SYMBOL(lprocfs_evict_client_fops);
-
-/* Function that emulates snprintf but also has the side effect of advancing
-   the page pointer for the next write into the buffer, incrementing the total
-   length written to the buffer, and decrementing the size left in the
-   buffer. */
-static int lprocfs_obd_snprintf(char **page, int end, int *len,
-                               const char *format, ...)
-{
-       va_list list;
-       int n;
-
-       if (*len >= end)
-               return 0;
-
-       va_start(list, format);
-       n = vsnprintf(*page, end - *len, format, list);
-       va_end(list);
-
-       *page += n; *len += n;
-       return n;
-}
-#endif /* HAVE_ONLY_PROCFS_SEQ */
-
 #undef BUFLEN
 
 int lprocfs_num_exports_seq_show(struct seq_file *m, void *data)
 #undef BUFLEN
 
 int lprocfs_num_exports_seq_show(struct seq_file *m, void *data)
@@ -223,26 +154,41 @@ void lprocfs_free_per_client_stats(struct obd_device *obd)
 }
 EXPORT_SYMBOL(lprocfs_free_per_client_stats);
 
 }
 EXPORT_SYMBOL(lprocfs_free_per_client_stats);
 
-int lprocfs_exp_nid_seq_show(struct seq_file *m, void *data)
+static int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+                                     struct hlist_node *hnode, void *cb_data)
 {
 {
-       struct obd_export *exp = m->private;
-       LASSERT(exp != NULL);
-       return seq_printf(m, "%s\n", obd_export_nid2str(exp));
-}
+       struct seq_file *m = cb_data;
+       struct obd_export *exp = cfs_hash_object(hs, hnode);
 
 
-int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                               struct hlist_node *hnode, void *cb_data)
+       if (exp->exp_nid_stats != NULL)
+               seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
+       return 0;
+}
 
 
+static int lprocfs_exp_print_nodemap_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+                                       struct hlist_node *hnode, void *cb_data)
 {
 {
-       struct obd_export *exp = cfs_hash_object(hs, hnode);
        struct seq_file *m = cb_data;
        struct seq_file *m = cb_data;
+       struct obd_export *exp = cfs_hash_object(hs, hnode);
+       struct lu_nodemap *nodemap = exp->exp_target_data.ted_nodemap;
 
 
-       if (exp->exp_nid_stats)
-               seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
+       if (nodemap != NULL)
+               seq_printf(m, "%s\n", nodemap->nm_name);
        return 0;
 }
 
        return 0;
 }
 
-int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
+static int lprocfs_exp_nodemap_seq_show(struct seq_file *m, void *data)
+{
+       struct nid_stat *stats = m->private;
+       struct obd_device *obd = stats->nid_obd;
+
+       cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
+                             lprocfs_exp_print_nodemap_seq, m);
+       return 0;
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_nodemap);
+
+static int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
 {
        struct nid_stat *stats = m->private;
        struct obd_device *obd = stats->nid_obd;
 {
        struct nid_stat *stats = m->private;
        struct obd_device *obd = stats->nid_obd;
@@ -253,21 +199,21 @@ int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid);
 
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid);
 
-int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                               struct hlist_node *hnode, void *cb_data)
+static int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+                                     struct hlist_node *hnode, void *cb_data)
 
 {
        struct seq_file *m = cb_data;
        struct obd_export *exp = cfs_hash_object(hs, hnode);
 
        if (exp->exp_lock_hash != NULL) {
 
 {
        struct seq_file *m = cb_data;
        struct obd_export *exp = cfs_hash_object(hs, hnode);
 
        if (exp->exp_lock_hash != NULL) {
-               cfs_hash_debug_header_seq(m);
-               cfs_hash_debug_str_seq(hs, m);
+               cfs_hash_debug_header(m);
+               cfs_hash_debug_str(hs, m);
        }
        return 0;
 }
 
        }
        return 0;
 }
 
-int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
+static int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
 {
        struct nid_stat *stats = m->private;
        struct obd_device *obd = stats->nid_obd;
 {
        struct nid_stat *stats = m->private;
        struct obd_device *obd = stats->nid_obd;
@@ -328,153 +274,15 @@ lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
 }
 EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_write);
 
 }
 EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_write);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_rd_num_exports(char *page, char **start, off_t off, int count,
-                          int *eof,  void *data)
-{
-       struct obd_device *obd = data;
-
-       LASSERT(obd != NULL);
-       *eof = 1;
-       return snprintf(page, count, "%u\n", obd->obd_num_exports);
-}
-EXPORT_SYMBOL(lprocfs_rd_num_exports);
-
-int lprocfs_exp_rd_nid(char *page, char **start, off_t off, int count,
-                        int *eof,  void *data)
-{
-       struct obd_export *exp = data;
-       LASSERT(exp != NULL);
-       *eof = 1;
-       return snprintf(page, count, "%s\n", obd_export_nid2str(exp));
-}
-
-struct exp_uuid_cb_data {
-       char                   *page;
-       int                     count;
-       int                    *eof;
-       int                    *len;
-};
-
-static void
-lprocfs_exp_rd_cb_data_init(struct exp_uuid_cb_data *cb_data, char *page,
-                           int count, int *eof, int *len)
-{
-       cb_data->page = page;
-       cb_data->count = count;
-       cb_data->eof = eof;
-       cb_data->len = len;
-}
-
-int lprocfs_exp_print_uuid(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                          struct hlist_node *hnode, void *cb_data)
-
-{
-       struct obd_export *exp = cfs_hash_object(hs, hnode);
-       struct exp_uuid_cb_data *data = (struct exp_uuid_cb_data *)cb_data;
-
-       if (exp->exp_nid_stats)
-               *data->len += snprintf((data->page + *data->len),
-                                      data->count, "%s\n",
-                                      obd_uuid2str(&exp->exp_client_uuid));
-       return 0;
-}
-
-int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count,
-                       int *eof,  void *data)
-{
-       struct nid_stat *stats = (struct nid_stat *)data;
-       struct exp_uuid_cb_data cb_data;
-       struct obd_device *obd = stats->nid_obd;
-       int len = 0;
-
-       *eof = 1;
-       page[0] = '\0';
-       lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len);
-       cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-                             lprocfs_exp_print_uuid, &cb_data);
-       return *cb_data.len;
-}
-
-int lprocfs_exp_print_hash(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                          struct hlist_node *hnode, void *cb_data)
-
-{
-       struct exp_uuid_cb_data *data = cb_data;
-       struct obd_export       *exp = cfs_hash_object(hs, hnode);
-
-       if (exp->exp_lock_hash != NULL) {
-               if (!*data->len) {
-                       *data->len += cfs_hash_debug_header(data->page,
-                                                           data->count);
-               }
-               *data->len += cfs_hash_debug_str(hs, data->page + *data->len,
-                                                data->count);
-       }
-       return 0;
-}
-
-int lprocfs_exp_rd_hash(char *page, char **start, off_t off, int count,
-                       int *eof,  void *data)
-{
-       struct nid_stat *stats = (struct nid_stat *)data;
-       struct exp_uuid_cb_data cb_data;
-       struct obd_device *obd = stats->nid_obd;
-       int len = 0;
-
-       *eof = 1;
-       page[0] = '\0';
-       lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len);
-
-       cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-                             lprocfs_exp_print_hash, &cb_data);
-       return *cb_data.len;
-}
-
-int lprocfs_nid_stats_clear_read(char *page, char **start, off_t off,
-                                       int count, int *eof,  void *data)
-{
-       *eof = 1;
-       return snprintf(page, count, "%s\n",
-                       "Write into this file to clear all nid stats and "
-                       "stale nid entries");
-}
-EXPORT_SYMBOL(lprocfs_nid_stats_clear_read);
-
-int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer,
-                                 unsigned long count, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       struct nid_stat *client_stat;
-       struct list_head free_list;
-
-       INIT_LIST_HEAD(&free_list);
-       cfs_hash_cond_del(obd->obd_nid_stats_hash,
-                         lprocfs_nid_stats_clear_write_cb, &free_list);
-
-       while (!list_empty(&free_list)) {
-               client_stat = list_entry(free_list.next, struct nid_stat,
-                                        nid_list);
-               list_del_init(&client_stat->nid_list);
-               lprocfs_free_client_stats(client_stat);
-       }
-
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_nid_stats_clear_write);
-#endif
-
-int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
+int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid)
 {
        struct nid_stat *new_stat, *old_stat;
        struct obd_device *obd = NULL;
        struct proc_dir_entry *entry;
 {
        struct nid_stat *new_stat, *old_stat;
        struct obd_device *obd = NULL;
        struct proc_dir_entry *entry;
-       char *buffer = NULL;
+       char nidstr[LNET_NIDSTR_SIZE];
        int rc = 0;
        ENTRY;
 
        int rc = 0;
        ENTRY;
 
-       *newnid = 0;
-
        if (!exp || !exp->exp_obd || !exp->exp_obd->obd_proc_exports_entry ||
            !exp->exp_obd->obd_nid_stats_hash)
                RETURN(-EINVAL);
        if (!exp || !exp->exp_obd || !exp->exp_obd->obd_proc_exports_entry ||
            !exp->exp_obd->obd_nid_stats_hash)
                RETURN(-EINVAL);
@@ -482,8 +290,10 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
        /* not test against zero because eric say:
         * You may only test nid against another nid, or LNET_NID_ANY.
         * Anything else is nonsense.*/
        /* not test against zero because eric say:
         * You may only test nid against another nid, or LNET_NID_ANY.
         * Anything else is nonsense.*/
-       if (!nid || *nid == LNET_NID_ANY)
-               RETURN(0);
+       if (nid == NULL || *nid == LNET_NID_ANY)
+               RETURN(-EALREADY);
+
+       libcfs_nid2str_r(*nid, nidstr, sizeof(nidstr));
 
        spin_lock(&exp->exp_lock);
        if (exp->exp_nid_stats != NULL) {
 
        spin_lock(&exp->exp_lock);
        if (exp->exp_nid_stats != NULL) {
@@ -500,16 +310,15 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
        if (new_stat == NULL)
                RETURN(-ENOMEM);
 
        if (new_stat == NULL)
                RETURN(-ENOMEM);
 
-       new_stat->nid           = *nid;
-       new_stat->nid_obd       = exp->exp_obd;
+       new_stat->nid     = *nid;
+       new_stat->nid_obd = exp->exp_obd;
        /* we need set default refcount to 1 to balance obd_disconnect */
        atomic_set(&new_stat->nid_exp_ref_count, 1);
 
        old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash,
                                           nid, &new_stat->nid_hash);
        CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n",
        /* we need set default refcount to 1 to balance obd_disconnect */
        atomic_set(&new_stat->nid_exp_ref_count, 1);
 
        old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash,
                                           nid, &new_stat->nid_hash);
        CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n",
-              old_stat, libcfs_nid2str(*nid),
-              atomic_read(&new_stat->nid_exp_ref_count));
+              old_stat, nidstr, atomic_read(&old_stat->nid_exp_ref_count));
 
        /* Return -EALREADY here so that we know that the /proc
         * entry already has been created */
 
        /* Return -EALREADY here so that we know that the /proc
         * entry already has been created */
@@ -524,66 +333,52 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
                GOTO(destroy_new, rc = -EALREADY);
        }
        /* not found - create */
                GOTO(destroy_new, rc = -EALREADY);
        }
        /* not found - create */
-       OBD_ALLOC(buffer, LNET_NIDSTR_SIZE);
-       if (buffer == NULL)
-               GOTO(destroy_new, rc = -ENOMEM);
-
-       memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE);
-#ifndef HAVE_ONLY_PROCFS_SEQ
-       new_stat->nid_proc = lprocfs_register(buffer,
+       new_stat->nid_proc = lprocfs_register(nidstr,
                                              obd->obd_proc_exports_entry,
                                              NULL, NULL);
                                              obd->obd_proc_exports_entry,
                                              NULL, NULL);
-#else
-       new_stat->nid_proc = lprocfs_seq_register(buffer,
-                                                 obd->obd_proc_exports_entry,
-                                                 NULL, NULL);
-#endif
-       OBD_FREE(buffer, LNET_NIDSTR_SIZE);
 
        if (IS_ERR(new_stat->nid_proc)) {
                rc = PTR_ERR(new_stat->nid_proc);
                new_stat->nid_proc = NULL;
                CERROR("%s: cannot create proc entry for export %s: rc = %d\n",
 
        if (IS_ERR(new_stat->nid_proc)) {
                rc = PTR_ERR(new_stat->nid_proc);
                new_stat->nid_proc = NULL;
                CERROR("%s: cannot create proc entry for export %s: rc = %d\n",
-                      obd->obd_name, libcfs_nid2str(*nid), rc);
+                      obd->obd_name, nidstr, rc);
+               GOTO(destroy_new_ns, rc);
+       }
+
+       entry = lprocfs_add_simple(new_stat->nid_proc, "nodemap", new_stat,
+                                  &lprocfs_exp_nodemap_fops);
+       if (IS_ERR(entry)) {
+               rc = PTR_ERR(entry);
+               CWARN("Error adding the nodemap file: rc = %d\n", rc);
                GOTO(destroy_new_ns, rc);
        }
 
                GOTO(destroy_new_ns, rc);
        }
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-       entry = lprocfs_add_simple(new_stat->nid_proc, "uuid",
-                                  lprocfs_exp_rd_uuid, NULL, new_stat, NULL);
-#else
        entry = lprocfs_add_simple(new_stat->nid_proc, "uuid", new_stat,
                                   &lprocfs_exp_uuid_fops);
        entry = lprocfs_add_simple(new_stat->nid_proc, "uuid", new_stat,
                                   &lprocfs_exp_uuid_fops);
-#endif
        if (IS_ERR(entry)) {
        if (IS_ERR(entry)) {
-               CWARN("Error adding the NID stats file\n");
                rc = PTR_ERR(entry);
                rc = PTR_ERR(entry);
+               CWARN("Error adding the NID stats file: rc = %d\n", rc);
                GOTO(destroy_new_ns, rc);
        }
 
                GOTO(destroy_new_ns, rc);
        }
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-       entry = lprocfs_add_simple(new_stat->nid_proc, "hash",
-                                  lprocfs_exp_rd_hash, NULL, new_stat, NULL);
-#else
        entry = lprocfs_add_simple(new_stat->nid_proc, "hash", new_stat,
                                   &lprocfs_exp_hash_fops);
        entry = lprocfs_add_simple(new_stat->nid_proc, "hash", new_stat,
                                   &lprocfs_exp_hash_fops);
-#endif
        if (IS_ERR(entry)) {
        if (IS_ERR(entry)) {
-               CWARN("Error adding the hash file\n");
                rc = PTR_ERR(entry);
                rc = PTR_ERR(entry);
+               CWARN("Error adding the hash file: rc = %d\n", rc);
                GOTO(destroy_new_ns, rc);
        }
 
        spin_lock(&exp->exp_lock);
        exp->exp_nid_stats = new_stat;
        spin_unlock(&exp->exp_lock);
                GOTO(destroy_new_ns, rc);
        }
 
        spin_lock(&exp->exp_lock);
        exp->exp_nid_stats = new_stat;
        spin_unlock(&exp->exp_lock);
-       *newnid = 1;
+
        /* protect competitive add to list, not need locking on destroy */
        spin_lock(&obd->obd_nid_lock);
        list_add(&new_stat->nid_list, &obd->obd_nid_stats);
        spin_unlock(&obd->obd_nid_lock);
 
        /* protect competitive add to list, not need locking on destroy */
        spin_lock(&obd->obd_nid_lock);
        list_add(&new_stat->nid_list, &obd->obd_nid_stats);
        spin_unlock(&obd->obd_nid_lock);
 
-       RETURN(rc);
+       RETURN(0);
 
 destroy_new_ns:
        if (new_stat->nid_proc != NULL)
 
 destroy_new_ns:
        if (new_stat->nid_proc != NULL)
@@ -609,7 +404,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp)
 
        return 0;
 }
 
        return 0;
 }
-EXPORT_SYMBOL(lprocfs_exp_cleanup);
 
 #define LPROCFS_OBD_OP_INIT(base, stats, op)                   \
 do {                                                           \
 
 #define LPROCFS_OBD_OP_INIT(base, stats, op)                   \
 do {                                                           \
@@ -648,12 +442,8 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr_async);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr_async);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);
-       LPROCFS_OBD_OP_INIT(num_private_stats, stats, change_cbdata);
-       LPROCFS_OBD_OP_INIT(num_private_stats, stats, find_cbdata);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);
-       LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_init);
-       LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);
        LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check);
@@ -725,10 +515,10 @@ int lprocfs_hash_seq_show(struct seq_file *m, void *data)
        if (obd == NULL)
                return 0;
 
        if (obd == NULL)
                return 0;
 
-       c += cfs_hash_debug_header_seq(m);
-       c += cfs_hash_debug_str_seq(obd->obd_uuid_hash, m);
-       c += cfs_hash_debug_str_seq(obd->obd_nid_hash, m);
-       c += cfs_hash_debug_str_seq(obd->obd_nid_stats_hash, m);
+       c += cfs_hash_debug_header(m);
+       c += cfs_hash_debug_str(obd->obd_uuid_hash, m);
+       c += cfs_hash_debug_str(obd->obd_nid_hash, m);
+       c += cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
        return c;
 }
 EXPORT_SYMBOL(lprocfs_hash_seq_show);
        return c;
 }
 EXPORT_SYMBOL(lprocfs_hash_seq_show);
@@ -893,246 +683,4 @@ int lprocfs_target_instance_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_target_instance_seq_show);
 
 }
 EXPORT_SYMBOL(lprocfs_target_instance_seq_show);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_obd_rd_hash(char *page, char **start, off_t off,
-                       int count, int *eof, void *data)
-{
-       struct obd_device *obd = data;
-       int c = 0;
-
-       if (obd == NULL)
-               return 0;
-
-       c += cfs_hash_debug_header(page, count);
-       c += cfs_hash_debug_str(obd->obd_uuid_hash, page + c, count - c);
-       c += cfs_hash_debug_str(obd->obd_nid_hash, page + c, count - c);
-       c += cfs_hash_debug_str(obd->obd_nid_stats_hash, page+c, count-c);
-
-       return c;
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_hash);
-
-int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data)
-{
-       struct obd_device *obd = data;
-       int len = 0, size;
-
-       LASSERT(obd != NULL);
-       LASSERT(count >= 0);
-
-       /* Set start of user data returned to
-          page + off since the user may have
-          requested to read much smaller than
-          what we need to read */
-       *start = page + off;
-
-       /*
-        * We know we are allocated a page here.
-        * Also we know that this function will
-        * not need to write more than a page
-        * so we can truncate at PAGE_CACHE_SIZE.
-        */
-       size = min(count + (int)off + 1, (int)PAGE_CACHE_SIZE);
-
-       /* Initialize the page */
-       memset(page, 0, size);
-
-       if (lprocfs_obd_snprintf(&page, size, &len, "status: ") <= 0)
-               goto out;
-       if (obd->obd_max_recoverable_clients == 0) {
-               if (lprocfs_obd_snprintf(&page, size, &len, "INACTIVE\n") <= 0)
-                       goto out;
-
-               goto fclose;
-       }
-
-       /* sampled unlocked, but really... */
-       if (obd->obd_recovering == 0) {
-               if (lprocfs_obd_snprintf(&page, size, &len, "COMPLETE\n") <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len,
-                                        "recovery_start: %lu\n",
-                                        obd->obd_recovery_start) <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len,
-                                        "recovery_duration: %lu\n",
-                                        obd->obd_recovery_end -
-                                        obd->obd_recovery_start) <= 0)
-                       goto out;
-               /* Number of clients that have completed recovery */
-               if (lprocfs_obd_snprintf(&page, size, &len,
-                                        "completed_clients: %d/%d\n",
-                                        obd->obd_max_recoverable_clients -
-                                        obd->obd_stale_clients,
-                                        obd->obd_max_recoverable_clients) <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len,
-                                        "replayed_requests: %d\n",
-                                        obd->obd_replayed_requests) <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len,
-                                        "last_transno: "LPD64"\n",
-                                        obd->obd_next_recovery_transno - 1) <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len, "VBR: %s\n",
-                                        obd->obd_version_recov ?
-                                        "ENABLED" : "DISABLED") <= 0)
-                       goto out;
-               if (lprocfs_obd_snprintf(&page, size, &len, "IR: %s\n",
-                                        obd->obd_no_ir ?
-                                        "DISABLED" : "ENABLED") <= 0)
-                       goto out;
-               goto fclose;
-       }
-
-       if (lprocfs_obd_snprintf(&page, size, &len, "RECOVERING\n") <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "recovery_start: %lu\n",
-                                obd->obd_recovery_start) <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "time_remaining: %lu\n",
-                                cfs_time_current_sec() >=
-                                obd->obd_recovery_start +
-                                obd->obd_recovery_timeout ? 0 :
-                                obd->obd_recovery_start +
-                                obd->obd_recovery_timeout -
-                                cfs_time_current_sec()) <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len,
-                                "connected_clients: %d/%d\n",
-                                atomic_read(&obd->obd_connected_clients),
-                                obd->obd_max_recoverable_clients) <= 0)
-               goto out;
-       /* Number of clients that have completed recovery */
-       if (lprocfs_obd_snprintf(&page, size, &len, "req_replay_clients: %d\n",
-                                atomic_read(&obd->obd_req_replay_clients))
-               <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "lock_repay_clients: %d\n",
-                                atomic_read(&obd->obd_lock_replay_clients))
-               <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "completed_clients: %d\n",
-                                atomic_read(&obd->obd_connected_clients) -
-                                atomic_read(&obd->obd_lock_replay_clients))
-               <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "evicted_clients: %d\n",
-                                obd->obd_stale_clients) <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "replayed_requests: %d\n",
-                                obd->obd_replayed_requests) <= 0)
-               goto out;
-       if (lprocfs_obd_snprintf(&page, size, &len, "queued_requests: %d\n",
-                                obd->obd_requests_queued_for_recovery) <= 0)
-               goto out;
-
-       if (lprocfs_obd_snprintf(&page, size, &len, "next_transno: "LPD64"\n",
-                                obd->obd_next_recovery_transno) <= 0)
-               goto out;
-
-fclose:
-       *eof = 1;
-out:
-       return min(count, len - (int)off);
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_recovery_status);
-
-int lprocfs_obd_rd_ir_factor(char *page, char **start, off_t off,
-                            int count, int *eof, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       LASSERT(obd != NULL);
-
-       return snprintf(page, count, "%d\n",
-                       obd->obd_recovery_ir_factor);
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_ir_factor);
-
-int lprocfs_obd_wr_ir_factor(struct file *file, const char *buffer,
-                            unsigned long count, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       int val, rc;
-       LASSERT(obd != NULL);
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-
-       if (val < OBD_IR_FACTOR_MIN || val > OBD_IR_FACTOR_MAX)
-               return -EINVAL;
-
-       obd->obd_recovery_ir_factor = val;
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_obd_wr_ir_factor);
-
-int lprocfs_obd_rd_recovery_time_soft(char *page, char **start, off_t off,
-                                     int count, int *eof, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       LASSERT(obd != NULL);
-
-       return snprintf(page, count, "%d\n",
-                       obd->obd_recovery_timeout);
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_soft);
-
-int lprocfs_obd_wr_recovery_time_soft(struct file *file, const char *buffer,
-                                     unsigned long count, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       int val, rc;
-       LASSERT(obd != NULL);
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-
-       obd->obd_recovery_timeout = val;
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_soft);
-
-int lprocfs_obd_rd_recovery_time_hard(char *page, char **start, off_t off,
-                                     int count, int *eof, void *data)
-{
-       struct obd_device *obd = data;
-       LASSERT(obd != NULL);
-
-       return snprintf(page, count, "%u\n", obd->obd_recovery_time_hard);
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_hard);
-
-int lprocfs_obd_wr_recovery_time_hard(struct file *file, const char *buffer,
-                                     unsigned long count, void *data)
-{
-       struct obd_device *obd = data;
-       int val, rc;
-       LASSERT(obd != NULL);
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-
-       obd->obd_recovery_time_hard = val;
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_hard);
-
-int lprocfs_target_rd_instance(char *page, char **start, off_t off,
-                              int count, int *eof, void *data)
-{
-       struct obd_device *obd = (struct obd_device *)data;
-       struct obd_device_target *target = &obd->u.obt;
-
-       LASSERT(obd != NULL);
-       LASSERT(target->obt_magic == OBT_MAGIC);
-       *eof = 1;
-       return snprintf(page, count, "%u\n", obd->u.obt.obt_instance);
-}
-EXPORT_SYMBOL(lprocfs_target_rd_instance);
-#endif /* HAVE_ONLY_PROCFS_SEQ */
-#endif /* LPROCFS*/
+#endif /* CONFIG_PROC_FS*/