Whamcloud - gitweb
LU-7543 obd: reserve connection flag OBD_CONNECT_LOCK_AHEAD
[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c
index 9527bb2..956abe2 100644 (file)
@@ -27,7 +27,7 @@
  * 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, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
 
-#if defined(LPROCFS)
+#ifdef CONFIG_PROC_FS
 
 static int lprocfs_no_percpu_stats = 0;
 CFS_MODULE_PARM(lprocfs_no_percpu_stats, "i", int, 0644,
@@ -68,115 +64,25 @@ int lprocfs_seq_release(struct inode *inode, struct file *file)
 }
 EXPORT_SYMBOL(lprocfs_seq_release);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-/* for b=10866, global variable */
-DECLARE_RWSEM(_lprocfs_lock);
-EXPORT_SYMBOL(_lprocfs_lock);
-
-static struct proc_dir_entry *__lprocfs_srch(struct proc_dir_entry *head,
-                                             const char *name)
-{
-        struct proc_dir_entry *temp;
-
-        if (head == NULL)
-                return NULL;
-
-        temp = head->subdir;
-        while (temp != NULL) {
-                if (strcmp(temp->name, name) == 0) {
-                        return temp;
-                }
-
-                temp = temp->next;
-        }
-        return NULL;
-}
-
-struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head,
-                                    const char *name)
-{
-        struct proc_dir_entry *temp;
-
-        LPROCFS_SRCH_ENTRY();
-        temp = __lprocfs_srch(head, name);
-        LPROCFS_SRCH_EXIT();
-        return temp;
-}
-EXPORT_SYMBOL(lprocfs_srch);
-
-/* lprocfs API calls */
-
-/* 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. */
-#ifdef HAVE_SERVER_SUPPORT
-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_SERVER_SUPPORT */
-#endif /* HAVE_ONLY_PROCFS_SEQ */
-
-cfs_proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root,
-                                         char *name,
-#ifndef HAVE_ONLY_PROCFS_SEQ
-                                        read_proc_t *read_proc,
-                                        write_proc_t *write_proc,
-#endif
-                                         void *data,
-                                         struct file_operations *fops)
+struct proc_dir_entry *
+lprocfs_add_simple(struct proc_dir_entry *root, char *name,
+                  void *data, const struct file_operations *fops)
 {
-        cfs_proc_dir_entry_t *proc;
-        mode_t mode = 0;
+       struct proc_dir_entry *proc;
+       mode_t mode = 0;
 
-        if (root == NULL || name == NULL)
+       if (root == NULL || name == NULL || fops == NULL)
                 return ERR_PTR(-EINVAL);
 
-       if (!fops) {
-#ifndef HAVE_ONLY_PROCFS_SEQ
-               if (read_proc)
-                       mode = 0444;
-               if (write_proc)
-                       mode |= 0200;
-
-               LPROCFS_WRITE_ENTRY();
-               proc = create_proc_entry(name, mode, root);
-               if (!proc) {
-                       CERROR("LprocFS: No memory to create /proc entry %s", name);
-                       LPROCFS_WRITE_EXIT();
-                       return ERR_PTR(-ENOMEM);
-               }
-               proc->read_proc = read_proc;
-               proc->write_proc = write_proc;
-               proc->data = data;
-               LPROCFS_WRITE_EXIT();
-#else
-               return ERR_PTR(-EINVAL);
-#endif
-       } else {
-               if (fops->read)
-                       mode = 0444;
-               if (fops->write)
-                       mode |= 0200;
-               proc = proc_create_data(name, mode, root, fops, data);
-               if (!proc) {
-                       CERROR("LprocFS: No memory to create /proc entry %s",
-                              name);
-                       return ERR_PTR(-ENOMEM);
-               }
+       if (fops->read)
+               mode = 0444;
+       if (fops->write)
+               mode |= 0200;
+       proc = proc_create_data(name, mode, root, fops, data);
+       if (!proc) {
+               CERROR("LprocFS: No memory to create /proc entry %s\n",
+                      name);
+               return ERR_PTR(-ENOMEM);
        }
         return proc;
 }
@@ -201,293 +107,16 @@ struct proc_dir_entry *lprocfs_add_symlink(const char *name,
         va_end(ap);
 
         entry = proc_symlink(name, parent, dest);
-        if (entry == NULL)
-                CERROR("LprocFS: Could not create symbolic link from %s to %s",
-                        name, dest);
+       if (entry == NULL)
+               CERROR("LprocFS: Could not create symbolic link from "
+                      "%s to %s\n", name, dest);
 
         OBD_FREE(dest, MAX_STRING_SIZE + 1);
         return entry;
 }
 EXPORT_SYMBOL(lprocfs_add_symlink);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-static ssize_t lprocfs_fops_read(struct file *f, char __user *buf,
-                                 size_t size, loff_t *ppos)
-{
-        struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode);
-        char *page, *start = NULL;
-        int rc = 0, eof = 1, count;
-
-       if (*ppos >= PAGE_CACHE_SIZE)
-                return 0;
-
-        page = (char *)__get_free_page(GFP_KERNEL);
-        if (page == NULL)
-                return -ENOMEM;
-
-       if (LPROCFS_ENTRY_CHECK(dp)) {
-                rc = -ENOENT;
-                goto out;
-        }
-
-        OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10);
-        if (dp->read_proc)
-               rc = dp->read_proc(page, &start, *ppos, PAGE_CACHE_SIZE,
-                                   &eof, dp->data);
-        if (rc <= 0)
-                goto out;
-
-        /* for lustre proc read, the read count must be less than PAGE_SIZE */
-        LASSERT(eof == 1);
-
-        if (start == NULL) {
-                rc -= *ppos;
-                if (rc < 0)
-                        rc = 0;
-                if (rc == 0)
-                        goto out;
-                start = page + *ppos;
-        } else if (start < page) {
-                start = page;
-        }
-
-        count = (rc < size) ? rc : size;
-       if (copy_to_user(buf, start, count)) {
-                rc = -EFAULT;
-                goto out;
-        }
-        *ppos += count;
-
-out:
-        free_page((unsigned long)page);
-        return rc;
-}
-
-static ssize_t lprocfs_fops_write(struct file *f, const char __user *buf,
-                                  size_t size, loff_t *ppos)
-{
-        struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode);
-        int rc = -EIO;
-
-       if (LPROCFS_ENTRY_CHECK(dp))
-                return -ENOENT;
-        if (dp->write_proc)
-                rc = dp->write_proc(f, buf, size, dp->data);
-        return rc;
-}
-
-static struct file_operations lprocfs_generic_fops = {
-        .owner = THIS_MODULE,
-        .read = lprocfs_fops_read,
-        .write = lprocfs_fops_write,
-};
-#else
-static struct file_operations lprocfs_generic_fops = { };
-#endif
-
-#ifdef HAVE_SERVER_SUPPORT
-int lprocfs_evict_client_open(struct inode *inode, struct file *f)
-{
-       struct obd_device *obd = PDE_DATA(f->f_dentry->d_inode);
-
-       atomic_inc(&obd->obd_evict_inprogress);
-       return 0;
-}
-
-int lprocfs_evict_client_release(struct inode *inode, struct file *f)
-{
-       struct obd_device *obd = PDE_DATA(f->f_dentry->d_inode);
-
-       atomic_dec(&obd->obd_evict_inprogress);
-       wake_up(&obd->obd_evict_inprogress_waitq);
-
-       return 0;
-}
-
-#define BUFLEN (UUID_MAX + 5)
-
-#ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_wr_evict_client(struct file *file, const char *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, __FUNCTION__, 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, __FUNCTION__, current);
-out:
-       OBD_FREE(kbuf, BUFLEN);
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_wr_evict_client);
-#endif
-
-ssize_t
-lprocfs_evict_client_seq_write(struct file *file, const char *buffer,
-                              size_t count, loff_t *off)
-{
-       struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-       char *tmpbuf, *kbuf;
-
-       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, __FUNCTION__, 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, __FUNCTION__, current);
-
-out:
-       OBD_FREE(kbuf, BUFLEN);
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_evict_client_seq_write);
-
-#undef BUFLEN
-
-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);
-#endif
-
-#ifndef HAVE_ONLY_PROCFS_SEQ
-static int __lprocfs_add_vars(struct proc_dir_entry *root,
-                             struct lprocfs_vars *list,
-                             void *data)
-{
-        int rc = 0;
-
-        if (root == NULL || list == NULL)
-                return -EINVAL;
-
-        while (list->name != NULL) {
-                struct proc_dir_entry *cur_root, *proc;
-                char *pathcopy, *cur, *next, pathbuf[64];
-                int pathsize = strlen(list->name) + 1;
-
-                proc = NULL;
-                cur_root = root;
-
-                /* need copy of path for strsep */
-                if (strlen(list->name) > sizeof(pathbuf) - 1) {
-                        OBD_ALLOC(pathcopy, pathsize);
-                        if (pathcopy == NULL)
-                                GOTO(out, rc = -ENOMEM);
-                } else {
-                        pathcopy = pathbuf;
-                }
-
-                next = pathcopy;
-                strcpy(pathcopy, list->name);
-
-                while (cur_root != NULL && (cur = strsep(&next, "/"))) {
-                        if (*cur =='\0') /* skip double/trailing "/" */
-                                continue;
-
-                        proc = __lprocfs_srch(cur_root, cur);
-                        CDEBUG(D_OTHER, "cur_root=%s, cur=%s, next=%s, (%s)\n",
-                               cur_root->name, cur, next,
-                               (proc ? "exists" : "new"));
-                        if (next != NULL) {
-                                cur_root = (proc ? proc :
-                                            proc_mkdir(cur, cur_root));
-                        } else if (proc == NULL) {
-                                mode_t mode = 0;
-                                if (list->proc_mode != 0000) {
-                                        mode = list->proc_mode;
-                                } else {
-                                        if (list->read_fptr)
-                                                mode = 0444;
-                                        if (list->write_fptr)
-                                                mode |= 0200;
-                                }
-                                proc = create_proc_entry(cur, mode, cur_root);
-                        }
-                }
-
-                if (pathcopy != pathbuf)
-                        OBD_FREE(pathcopy, pathsize);
-
-                if (cur_root == NULL || proc == NULL) {
-                        CERROR("LprocFS: No memory to create /proc entry %s",
-                               list->name);
-                        GOTO(out, rc = -ENOMEM);
-                }
-
-                if (list->fops)
-                        proc->proc_fops = list->fops;
-                else
-                        proc->proc_fops = &lprocfs_generic_fops;
-                proc->read_proc = list->read_fptr;
-                proc->write_proc = list->write_fptr;
-                proc->data = (list->data ? list->data : data);
-                list++;
-        }
-out:
-        return rc;
-}
-
-int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
-                    void *data)
-{
-       int rc = 0;
-
-       LPROCFS_WRITE_ENTRY();
-       rc = __lprocfs_add_vars(root, list, data);
-       LPROCFS_WRITE_EXIT();
-
-       return rc;
-}
-EXPORT_SYMBOL(lprocfs_add_vars);
-
-#endif
+static const struct file_operations lprocfs_generic_fops = { };
 
 /**
  * Add /proc entries.
@@ -501,8 +130,8 @@ EXPORT_SYMBOL(lprocfs_add_vars);
  *         < 0 on error
  */
 int
-lprocfs_seq_add_vars(struct proc_dir_entry *root, struct lprocfs_seq_vars *list,
-                    void *data)
+lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
+                void *data)
 {
        if (root == NULL || list == NULL)
                return -EINVAL;
@@ -528,10 +157,14 @@ lprocfs_seq_add_vars(struct proc_dir_entry *root, struct lprocfs_seq_vars *list,
        }
        return 0;
 }
-EXPORT_SYMBOL(lprocfs_seq_add_vars);
+EXPORT_SYMBOL(lprocfs_add_vars);
+
+#ifndef HAVE_REMOVE_PROC_SUBTREE
+/* for b=10866, global variable */
+DECLARE_RWSEM(_lprocfs_lock);
+EXPORT_SYMBOL(_lprocfs_lock);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-void lprocfs_remove_nolock(struct proc_dir_entry **proot)
+static void lprocfs_remove_nolock(struct proc_dir_entry **proot)
 {
        struct proc_dir_entry *root = *proot;
        struct proc_dir_entry *temp = root;
@@ -563,31 +196,8 @@ void lprocfs_remove_nolock(struct proc_dir_entry **proot)
                         break;
         }
 }
-#endif
-
-void lprocfs_remove(struct proc_dir_entry **rooth)
-{
-#ifndef HAVE_ONLY_PROCFS_SEQ
-       LPROCFS_WRITE_ENTRY(); /* search vs remove race */
-       lprocfs_remove_nolock(rooth);
-       LPROCFS_WRITE_EXIT();
-#else
-       proc_remove(*rooth);
-       *rooth = NULL;
-#endif
-}
-EXPORT_SYMBOL(lprocfs_remove);
-
-void lprocfs_remove_proc_entry(const char *name, struct proc_dir_entry *parent)
-{
-        LASSERT(parent != NULL);
-        remove_proc_entry(name, parent);
-}
-EXPORT_SYMBOL(lprocfs_remove_proc_entry);
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-void lprocfs_try_remove_proc_entry(const char *name,
-                                  struct proc_dir_entry *parent)
+int remove_proc_subtree(const char *name, struct proc_dir_entry *parent)
 {
        struct proc_dir_entry    *t = NULL;
        struct proc_dir_entry   **p;
@@ -596,8 +206,7 @@ void lprocfs_try_remove_proc_entry(const char *name,
        LASSERT(parent != NULL);
        len = strlen(name);
 
-       LPROCFS_WRITE_ENTRY();
-
+       down_write(&_lprocfs_lock);
        /* lookup target name */
        for (p = &parent->subdir; *p; p = &(*p)->next) {
                if ((*p)->namelen != len)
@@ -626,53 +235,51 @@ void lprocfs_try_remove_proc_entry(const char *name,
        if (busy == 0)
                lprocfs_remove_nolock(&t);
 
-       LPROCFS_WRITE_EXIT();
-
-       return;
+       up_write(&_lprocfs_lock);
+       return 0;
 }
-EXPORT_SYMBOL(lprocfs_try_remove_proc_entry);
+#endif /* !HAVE_REMOVE_PROC_SUBTREE */
 
-struct proc_dir_entry *lprocfs_register(const char *name,
-                                       struct proc_dir_entry *parent,
-                                       struct lprocfs_vars *list, void *data)
+#ifndef HAVE_PROC_REMOVE
+void proc_remove(struct proc_dir_entry *de)
 {
-       struct proc_dir_entry *entry;
-       int rc;
-
-       LPROCFS_WRITE_ENTRY();
-       entry = __lprocfs_srch(parent, name);
-       if (entry != NULL) {
-               CERROR("entry '%s' already registered\n", name);
-               GOTO(out, entry = ERR_PTR(-EALREADY));
-       }
+#ifndef HAVE_REMOVE_PROC_SUBTREE
+       down_write(&_lprocfs_lock); /* search vs remove race */
+       lprocfs_remove_nolock(&de);
+       up_write(&_lprocfs_lock);
+#else
+       if (de)
+               remove_proc_subtree(de->name, de->parent);
+#endif
+}
+#endif
 
-       entry = proc_mkdir(name, parent);
-       if (entry == NULL)
-               GOTO(out, entry = ERR_PTR(-ENOMEM));
+void lprocfs_remove(struct proc_dir_entry **rooth)
+{
+       proc_remove(*rooth);
+       *rooth = NULL;
+}
+EXPORT_SYMBOL(lprocfs_remove);
 
-       if (list != NULL) {
-               rc = __lprocfs_add_vars(entry, list, data);
-               if (rc != 0) {
-                       lprocfs_remove_nolock(&entry);
-                       GOTO(out, entry = ERR_PTR(rc));
-               }
-       }
-out:
-       LPROCFS_WRITE_EXIT();
-       return entry;
+void lprocfs_remove_proc_entry(const char *name, struct proc_dir_entry *parent)
+{
+       LASSERT(parent != NULL);
+       remove_proc_entry(name, parent);
 }
-EXPORT_SYMBOL(lprocfs_register);
-#endif
+EXPORT_SYMBOL(lprocfs_remove_proc_entry);
 
 struct proc_dir_entry *
-lprocfs_seq_register(const char *name, struct proc_dir_entry *parent,
-                    struct lprocfs_seq_vars *list, void *data)
+lprocfs_register(const char *name, struct proc_dir_entry *parent,
+                struct lprocfs_vars *list, void *data)
 {
        struct proc_dir_entry *newchild;
 
        newchild = proc_mkdir(name, parent);
-       if (newchild != NULL && list != NULL) {
-               int rc = lprocfs_seq_add_vars(newchild, list, data);
+       if (newchild == NULL)
+               return ERR_PTR(-ENOMEM);
+
+       if (list != NULL) {
+               int rc = lprocfs_add_vars(newchild, list, data);
                if (rc) {
                        lprocfs_remove(&newchild);
                        return ERR_PTR(rc);
@@ -680,7 +287,7 @@ lprocfs_seq_register(const char *name, struct proc_dir_entry *parent,
        }
        return newchild;
 }
-EXPORT_SYMBOL(lprocfs_seq_register);
+EXPORT_SYMBOL(lprocfs_register);
 
 /* Generic callbacks */
 int lprocfs_uint_seq_show(struct seq_file *m, void *data)
@@ -689,7 +296,7 @@ int lprocfs_uint_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_uint_seq_show);
 
-int lprocfs_wr_uint(struct file *file, const char *buffer,
+int lprocfs_wr_uint(struct file *file, const char __user *buffer,
                     unsigned long count, void *data)
 {
         unsigned *p = data;
@@ -709,7 +316,7 @@ int lprocfs_wr_uint(struct file *file, const char *buffer,
 }
 EXPORT_SYMBOL(lprocfs_wr_uint);
 
-ssize_t lprocfs_uint_seq_write(struct file *file, const char *buffer,
+ssize_t lprocfs_uint_seq_write(struct file *file, const char __user *buffer,
                               size_t count, loff_t *off)
 {
        int *data = ((struct seq_file *)file->private_data)->private;
@@ -739,7 +346,7 @@ int lprocfs_atomic_seq_show(struct seq_file *m, void *data)
 EXPORT_SYMBOL(lprocfs_atomic_seq_show);
 
 ssize_t
-lprocfs_atomic_seq_write(struct file *file, const char *buffer,
+lprocfs_atomic_seq_write(struct file *file, const char __user *buffer,
                        size_t count, loff_t *off)
 {
        atomic_t *atm = ((struct seq_file *)file->private_data)->private;
@@ -951,17 +558,18 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx,
 
        lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags);
 }
-EXPORT_SYMBOL(lprocfs_stats_collect);
 
 /**
  * Append a space separated list of current set flags to str.
  */
-#define flag2seqstr(flag)                                              \
+#define flag2str(flag)                                         \
        do {                                                            \
-               if (imp->imp_##flag)                                    \
+               if (imp->imp_##flag) {                                  \
                        seq_printf(m, "%s" #flag, first ? "" : ", ");   \
+                       first = false;                                  \
+               }                                                       \
        } while (0)
-static int obd_import_flags2seqstr(struct obd_import *imp, struct seq_file *m)
+static void obd_import_flags2str(struct obd_import *imp, struct seq_file *m)
 {
        bool first = true;
 
@@ -970,13 +578,19 @@ static int obd_import_flags2seqstr(struct obd_import *imp, struct seq_file *m)
                first = false;
        }
 
-       flag2seqstr(invalid);
-       flag2seqstr(deactive);
-       flag2seqstr(replayable);
-       flag2seqstr(pingable);
-       return 0;
+       flag2str(invalid);
+       flag2str(deactive);
+       flag2str(replayable);
+       flag2str(delayed_recovery);
+       flag2str(no_lock_replay);
+       flag2str(vbr_failed);
+       flag2str(pingable);
+       flag2str(resend_replay);
+       flag2str(no_pinger_recover);
+       flag2str(need_mne_swab);
+       flag2str(connect_tried);
 }
-#undef flags2seqstr
+#undef flag2str
 
 static const char *obd_connect_names[] = {
        "read_only",
@@ -1032,7 +646,16 @@ static const char *obd_connect_names[] = {
        "pingless",
        "flock_deadlock",
        "disp_stripe",
+       "open_by_fid",
+       "lfsck",
        "unknown",
+       "unlink_close",
+       "multi_mod_rpcs",
+       "dir_stripe",
+       "fileset_mount",
+       "lock_ahead",
+       "bulk_mbits",
+       "compact_obdo",
        NULL
 };
 
@@ -1050,7 +673,7 @@ static void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags, char *sep
                }
        }
        if (flags & ~(mask - 1))
-               seq_printf(m, "%sunknown flags "LPX64,
+               seq_printf(m, "%sunknown_"LPX64,
                           first ? "" : sep, flags & ~(mask - 1));
 }
 
@@ -1066,7 +689,7 @@ int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep)
        }
        if (flags & ~(mask - 1))
                ret += snprintf(page + ret, count - ret,
-                               "%sunknown flags "LPX64,
+                               "%sunknown_"LPX64,
                                ret ? sep : "", flags & ~(mask - 1));
        return ret;
 }
@@ -1075,7 +698,7 @@ EXPORT_SYMBOL(obd_connect_flags2str);
 static void obd_connect_data_seqprint(struct seq_file *m,
                                      struct obd_connect_data *ocd)
 {
-       int flags;
+       __u64 flags;
 
        LASSERT(ocd != NULL);
        flags = ocd->ocd_connect_flags;
@@ -1120,10 +743,14 @@ static void obd_connect_data_seqprint(struct seq_file *m,
        if (flags & OBD_CONNECT_MAXBYTES)
                seq_printf(m, "       max_object_bytes: "LPU64"\n",
                              ocd->ocd_maxbytes);
+       if (flags & OBD_CONNECT_MULTIMODRPCS)
+               seq_printf(m, "       max_mod_rpcs: %hu\n",
+                             ocd->ocd_maxmodrpcs);
 }
 
 int lprocfs_import_seq_show(struct seq_file *m, void *data)
 {
+       char                            nidstr[LNET_NIDSTR_SIZE];
        struct lprocfs_counter          ret;
        struct lprocfs_counter_header   *header;
        struct obd_device               *obd    = (struct obd_device *)data;
@@ -1143,34 +770,39 @@ int lprocfs_import_seq_show(struct seq_file *m, void *data)
                      "    name: %s\n"
                      "    target: %s\n"
                      "    state: %s\n"
-                     "    connect_flags: [",
+                     "    connect_flags: [ ",
                      obd->obd_name,
                      obd2cli_tgt(obd),
                      ptlrpc_import_state_name(imp->imp_state));
        obd_connect_seq_flags2str(m, imp->imp_connect_data.ocd_connect_flags,
                                        ", ");
-       seq_printf(m, "]\n");
+       seq_printf(m, " ]\n");
        obd_connect_data_seqprint(m, ocd);
-       seq_printf(m, "    import_flags: [");
-       obd_import_flags2seqstr(imp, m);
+       seq_printf(m, "    import_flags: [ ");
+       obd_import_flags2str(imp, m);
 
-       seq_printf(m, "]\n"
+       seq_printf(m, " ]\n"
                      "    connection:\n"
-                     "       failover_nids: [");
+                     "       failover_nids: [ ");
        spin_lock(&imp->imp_lock);
        j = 0;
        list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
-               seq_printf(m, "%s%s", j ? ", " : "",
-                          libcfs_nid2str(conn->oic_conn->c_peer.nid));
+               libcfs_nid2str_r(conn->oic_conn->c_peer.nid,
+                                nidstr, sizeof(nidstr));
+               seq_printf(m, "%s%s", j ? ", " : "", nidstr);
                j++;
        }
-       seq_printf(m, "]\n"
+       if (imp->imp_connection != NULL)
+               libcfs_nid2str_r(imp->imp_connection->c_peer.nid,
+                                nidstr, sizeof(nidstr));
+       else
+               strncpy(nidstr, "<none>", sizeof(nidstr));
+       seq_printf(m, " ]\n"
                      "       current_connection: %s\n"
                      "       connection_attempts: %u\n"
                      "       generation: %u\n"
                      "       in-progress_invalidations: %u\n",
-                     imp->imp_connection == NULL ? "<none>" :
-                             libcfs_nid2str(imp->imp_connection->c_peer.nid),
+                     nidstr,
                      imp->imp_conn_cnt,
                      imp->imp_generation,
                      atomic_read(&imp->imp_inval_count));
@@ -1277,7 +909,7 @@ int lprocfs_state_seq_show(struct seq_file *m, void *data)
                        &imp->imp_state_hist[(k + j) % IMP_STATE_HIST_LEN];
                if (ish->ish_state == 0)
                        continue;
-               seq_printf(m, " - ["CFS_TIME_T", %s]\n",
+               seq_printf(m, " - [ "CFS_TIME_T", %s ]\n",
                           ish->ish_time,
                ptlrpc_import_state_name(ish->ish_state));
        }
@@ -1287,7 +919,7 @@ int lprocfs_state_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_state_seq_show);
 
-int lprocfs_seq_at_hist_helper(struct seq_file *m, struct adaptive_timeout *at)
+int lprocfs_at_hist_helper(struct seq_file *m, struct adaptive_timeout *at)
 {
        int i;
        for (i = 0; i < AT_BINS; i++)
@@ -1295,7 +927,7 @@ int lprocfs_seq_at_hist_helper(struct seq_file *m, struct adaptive_timeout *at)
        seq_printf(m, "\n");
        return 0;
 }
-EXPORT_SYMBOL(lprocfs_seq_at_hist_helper);
+EXPORT_SYMBOL(lprocfs_at_hist_helper);
 
 /* See also ptlrpc_lprocfs_timeouts_show_seq */
 int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
@@ -1324,7 +956,7 @@ int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
        s2dhms(&ts, now - worstt);
        seq_printf(m, "%-10s : cur %3u  worst %3u (at %ld, "DHMS_FMT" ago) ",
                   "network", cur, worst, worstt, DHMS_VARS(&ts));
-       lprocfs_seq_at_hist_helper(m, &imp->imp_at.iat_net_latency);
+       lprocfs_at_hist_helper(m, &imp->imp_at.iat_net_latency);
 
        for(i = 0; i < IMP_AT_MAX_PORTALS; i++) {
                if (imp->imp_at.iat_portal[i] == 0)
@@ -1336,7 +968,7 @@ int lprocfs_timeouts_seq_show(struct seq_file *m, void *data)
                seq_printf(m, "portal %-2d  : cur %3u  worst %3u (at %ld, "
                           DHMS_FMT" ago) ", imp->imp_at.iat_portal[i],
                           cur, worst, worstt, DHMS_VARS(&ts));
-               lprocfs_seq_at_hist_helper(m, &imp->imp_at.iat_service_estimate[i]);
+               lprocfs_at_hist_helper(m, &imp->imp_at.iat_service_estimate[i]);
        }
 
        LPROCFS_CLIMP_EXIT(obd);
@@ -1359,668 +991,54 @@ int lprocfs_connect_flags_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_connect_flags_seq_show);
 
-#ifdef HAVE_SERVER_SUPPORT
-int lprocfs_num_exports_seq_show(struct seq_file *m, void *data)
+int
+lprocfs_obd_setup(struct obd_device *obd)
 {
-       struct obd_device *obd = data;
+       int rc = 0;
 
        LASSERT(obd != NULL);
-       return seq_printf(m, "%u\n", obd->obd_num_exports);
-}
-EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
-#endif
-
-#ifndef HAVE_ONLY_PROCFS_SEQ
-
-int lprocfs_rd_uint(char *page, char **start, off_t off,
-                   int count, int *eof, void *data)
-{
-       unsigned int *temp = data;
-       return snprintf(page, count, "%u\n", *temp);
-}
-EXPORT_SYMBOL(lprocfs_rd_uint);
-
-int lprocfs_rd_u64(char *page, char **start, off_t off,
-                   int count, int *eof, void *data)
-{
-        LASSERT(data != NULL);
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", *(__u64 *)data);
-}
-EXPORT_SYMBOL(lprocfs_rd_u64);
-
-int lprocfs_rd_atomic(char *page, char **start, off_t off,
-                   int count, int *eof, void *data)
-{
-       atomic_t *atom = data;
-        LASSERT(atom != NULL);
-        *eof = 1;
-       return snprintf(page, count, "%d\n", atomic_read(atom));
-}
-EXPORT_SYMBOL(lprocfs_rd_atomic);
-
-int lprocfs_wr_atomic(struct file *file, const char *buffer,
-                      unsigned long count, void *data)
-{
-       atomic_t *atm = data;
-        int val = 0;
-        int rc;
-
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc < 0)
-                return rc;
-
-        if (val <= 0)
-                return -ERANGE;
-
-       atomic_set(atm, val);
-        return count;
-}
-EXPORT_SYMBOL(lprocfs_wr_atomic);
-
-int lprocfs_rd_uuid(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, "%s\n", obd->obd_uuid.uuid);
-}
-EXPORT_SYMBOL(lprocfs_rd_uuid);
-
-int lprocfs_rd_name(char *page, char **start, off_t off, int count,
-                    int *eof, void *data)
-{
-        struct obd_device *dev = data;
+       LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+       LASSERT(obd->obd_type->typ_procroot != NULL);
 
-        LASSERT(dev != NULL);
-        *eof = 1;
-        return snprintf(page, count, "%s\n", dev->obd_name);
+       obd->obd_proc_entry = lprocfs_register(obd->obd_name,
+                                              obd->obd_type->typ_procroot,
+                                              obd->obd_vars, obd);
+       if (IS_ERR(obd->obd_proc_entry)) {
+               rc = PTR_ERR(obd->obd_proc_entry);
+               CERROR("error %d setting up lprocfs for %s\n",rc,obd->obd_name);
+               obd->obd_proc_entry = NULL;
+       }
+       return rc;
 }
-EXPORT_SYMBOL(lprocfs_rd_name);
+EXPORT_SYMBOL(lprocfs_obd_setup);
 
-int lprocfs_rd_blksize(char *page, char **start, off_t off, int count,
-                       int *eof, void *data)
+int lprocfs_obd_cleanup(struct obd_device *obd)
 {
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, "%u\n", osfs.os_bsize);
+        if (!obd)
+                return -EINVAL;
+        if (obd->obd_proc_exports_entry) {
+                /* Should be no exports left */
+                lprocfs_remove(&obd->obd_proc_exports_entry);
+                obd->obd_proc_exports_entry = NULL;
         }
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_blksize);
-
-int lprocfs_rd_kbytestotal(char *page, char **start, off_t off, int count,
-                           int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                __u32 blk_size = osfs.os_bsize >> 10;
-                __u64 result = osfs.os_blocks;
-
-                while (blk_size >>= 1)
-                        result <<= 1;
-
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
+        if (obd->obd_proc_entry) {
+                lprocfs_remove(&obd->obd_proc_entry);
+                obd->obd_proc_entry = NULL;
         }
-        return rc;
+        return 0;
 }
-EXPORT_SYMBOL(lprocfs_rd_kbytestotal);
+EXPORT_SYMBOL(lprocfs_obd_cleanup);
 
-int lprocfs_rd_kbytesfree(char *page, char **start, off_t off, int count,
-                          int *eof, void *data)
+int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid)
 {
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                __u32 blk_size = osfs.os_bsize >> 10;
-                __u64 result = osfs.os_bfree;
-
-                while (blk_size >>= 1)
-                        result <<= 1;
-
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_kbytesfree);
+       struct lprocfs_counter  *cntr;
+       unsigned int            percpusize;
+       int                     rc = -ENOMEM;
+       unsigned long           flags = 0;
+       int                     i;
 
-int lprocfs_rd_kbytesavail(char *page, char **start, off_t off, int count,
-                           int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                __u32 blk_size = osfs.os_bsize >> 10;
-                __u64 result = osfs.os_bavail;
-
-                while (blk_size >>= 1)
-                        result <<= 1;
-
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_kbytesavail);
-
-int lprocfs_rd_filestotal(char *page, char **start, off_t off, int count,
-                          int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", osfs.os_files);
-        }
-
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_filestotal);
-
-int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        struct obd_statfs  osfs;
-        int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                            cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                            OBD_STATFS_NODELAY);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", osfs.os_ffree);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_filesfree);
-
-int lprocfs_rd_server_uuid(char *page, char **start, off_t off, int count,
-                           int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        struct obd_import *imp;
-        char *imp_state_name = NULL;
-        int rc = 0;
-
-        LASSERT(obd != NULL);
-        LPROCFS_CLIMP_CHECK(obd);
-        imp = obd->u.cli.cl_import;
-        imp_state_name = ptlrpc_import_state_name(imp->imp_state);
-        *eof = 1;
-        rc = snprintf(page, count, "%s\t%s%s\n",
-                      obd2cli_tgt(obd), imp_state_name,
-                      imp->imp_deactive ? "\tDEACTIVATED" : "");
-
-        LPROCFS_CLIMP_EXIT(obd);
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_server_uuid);
-
-int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count,
-                         int *eof,  void *data)
-{
-        struct obd_device *obd = data;
-        struct ptlrpc_connection *conn;
-        int rc = 0;
-
-        LASSERT(obd != NULL);
-
-        LPROCFS_CLIMP_CHECK(obd);
-        conn = obd->u.cli.cl_import->imp_connection;
-        *eof = 1;
-        if (conn && obd->u.cli.cl_import) {
-                rc = snprintf(page, count, "%s\n",
-                              conn->c_remote_uuid.uuid);
-        } else {
-                rc = snprintf(page, count, "%s\n", "<none>");
-        }
-
-        LPROCFS_CLIMP_EXIT(obd);
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_conn_uuid);
-
-/**
- * Append a space separated list of current set flags to str.
- */
-#define flag2str(flag) \
-        if (imp->imp_##flag && max - len > 0) \
-             len += snprintf(str + len, max - len, "%s" #flag, len ? ", " : "");
-static int obd_import_flags2str(struct obd_import *imp, char *str, int max)
-{
-        int len = 0;
-
-        if (imp->imp_obd->obd_no_recov)
-                len += snprintf(str, max - len, "no_recov");
-
-        flag2str(invalid);
-        flag2str(deactive);
-        flag2str(replayable);
-        flag2str(pingable);
-        return len;
-}
-#undef flags2str
-
-int lprocfs_rd_import(char *page, char **start, off_t off, int count,
-                      int *eof, void *data)
-{
-       struct lprocfs_counter          ret;
-       struct lprocfs_counter_header   *header;
-       struct obd_device               *obd    = (struct obd_device *)data;
-       struct obd_import               *imp;
-       struct obd_import_conn          *conn;
-       int                             i;
-       int                             j;
-       int                             k;
-       int                             rw      = 0;
-
-        LASSERT(obd != NULL);
-        LPROCFS_CLIMP_CHECK(obd);
-        imp = obd->u.cli.cl_import;
-        *eof = 1;
-
-        i = snprintf(page, count,
-                     "import:\n"
-                     "    name: %s\n"
-                     "    target: %s\n"
-                     "    state: %s\n"
-                     "    instance: %u\n"
-                     "    connect_flags: [",
-                     obd->obd_name,
-                     obd2cli_tgt(obd),
-                     ptlrpc_import_state_name(imp->imp_state),
-                     imp->imp_connect_data.ocd_instance);
-        i += obd_connect_flags2str(page + i, count - i,
-                                   imp->imp_connect_data.ocd_connect_flags,
-                                   ", ");
-        i += snprintf(page + i, count - i,
-                      "]\n"
-                      "    import_flags: [");
-        i += obd_import_flags2str(imp, page + i, count - i);
-
-        i += snprintf(page + i, count - i,
-                      "]\n"
-                      "    connection:\n"
-                      "       failover_nids: [");
-       spin_lock(&imp->imp_lock);
-        j = 0;
-        cfs_list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
-                i += snprintf(page + i, count - i, "%s%s", j ? ", " : "",
-                              libcfs_nid2str(conn->oic_conn->c_peer.nid));
-                j++;
-        }
-       i += snprintf(page + i, count - i,
-                     "]\n"
-                     "       current_connection: %s\n"
-                     "       connection_attempts: %u\n"
-                     "       generation: %u\n"
-                     "       in-progress_invalidations: %u\n",
-                     imp->imp_connection == NULL ? "<none>" :
-                             libcfs_nid2str(imp->imp_connection->c_peer.nid),
-                     imp->imp_conn_cnt,
-                     imp->imp_generation,
-                     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) {
-                /* first argument to do_div MUST be __u64 */
-                __u64 sum = ret.lc_sum;
-                do_div(sum, ret.lc_count);
-                ret.lc_sum = sum;
-        } else
-                ret.lc_sum = 0;
-        i += snprintf(page + i, count - i,
-                      "    rpcs:\n"
-                      "       inflight: %u\n"
-                      "       unregistering: %u\n"
-                      "       timeouts: %u\n"
-                      "       avg_waittime: "LPU64" %s\n",
-                     atomic_read(&imp->imp_inflight),
-                     atomic_read(&imp->imp_unregistering),
-                     atomic_read(&imp->imp_timeouts),
-                     ret.lc_sum, header->lc_units);
-
-        k = 0;
-        for(j = 0; j < IMP_AT_MAX_PORTALS; j++) {
-                if (imp->imp_at.iat_portal[j] == 0)
-                        break;
-                k = max_t(unsigned int, k,
-                          at_get(&imp->imp_at.iat_service_estimate[j]));
-        }
-        i += snprintf(page + i, count - i,
-                      "    service_estimates:\n"
-                      "       services: %u sec\n"
-                      "       network: %u sec\n",
-                      k,
-                      at_get(&imp->imp_at.iat_net_latency));
-
-        i += snprintf(page + i, count - i,
-                      "    transactions:\n"
-                      "       last_replay: "LPU64"\n"
-                      "       peer_committed: "LPU64"\n"
-                      "       last_checked: "LPU64"\n",
-                      imp->imp_last_replay_transno,
-                      imp->imp_peer_committed_transno,
-                      imp->imp_last_transno_checked);
-
-        /* avg data rates */
-        for (rw = 0; rw <= 1; rw++) {
-                lprocfs_stats_collect(obd->obd_svc_stats,
-                                      PTLRPC_LAST_CNTR + BRW_READ_BYTES + rw,
-                                      &ret);
-                if (ret.lc_sum > 0 && ret.lc_count > 0) {
-                        /* first argument to do_div MUST be __u64 */
-                        __u64 sum = ret.lc_sum;
-                        do_div(sum, ret.lc_count);
-                        ret.lc_sum = sum;
-                        i += snprintf(page + i, count - i,
-                                      "    %s_data_averages:\n"
-                                      "       bytes_per_rpc: "LPU64"\n",
-                                      rw ? "write" : "read",
-                                      ret.lc_sum);
-                }
-                k = (int)ret.lc_sum;
-                j = opcode_offset(OST_READ + rw) + EXTRA_MAX_OPCODES;
-               header = &obd->obd_svc_stats->ls_cnt_header[j];
-                lprocfs_stats_collect(obd->obd_svc_stats, j, &ret);
-                if (ret.lc_sum > 0 && ret.lc_count != 0) {
-                        /* first argument to do_div MUST be __u64 */
-                        __u64 sum = ret.lc_sum;
-                        do_div(sum, ret.lc_count);
-                        ret.lc_sum = sum;
-                        i += snprintf(page + i, count - i,
-                                      "       %s_per_rpc: "LPU64"\n",
-                                     header->lc_units, ret.lc_sum);
-                        j = (int)ret.lc_sum;
-                        if (j > 0)
-                                i += snprintf(page + i, count - i,
-                                              "       MB_per_sec: %u.%.02u\n",
-                                              k / j, (100 * k / j) % 100);
-                }
-        }
-
-out_climp:
-        LPROCFS_CLIMP_EXIT(obd);
-        return i;
-}
-EXPORT_SYMBOL(lprocfs_rd_import);
-
-int lprocfs_rd_state(char *page, char **start, off_t off, int count,
-                      int *eof, void *data)
-{
-        struct obd_device *obd = (struct obd_device *)data;
-        struct obd_import *imp;
-        int i, j, k;
-
-        LASSERT(obd != NULL);
-        LPROCFS_CLIMP_CHECK(obd);
-        imp = obd->u.cli.cl_import;
-        *eof = 1;
-
-        i = snprintf(page, count, "current_state: %s\n",
-                     ptlrpc_import_state_name(imp->imp_state));
-        i += snprintf(page + i, count - i,
-                      "state_history:\n");
-        k = imp->imp_state_hist_idx;
-        for (j = 0; j < IMP_STATE_HIST_LEN; j++) {
-                struct import_state_hist *ish =
-                        &imp->imp_state_hist[(k + j) % IMP_STATE_HIST_LEN];
-                if (ish->ish_state == 0)
-                        continue;
-                i += snprintf(page + i, count - i, " - ["CFS_TIME_T", %s]\n",
-                              ish->ish_time,
-                              ptlrpc_import_state_name(ish->ish_state));
-        }
-
-        LPROCFS_CLIMP_EXIT(obd);
-        return i;
-}
-EXPORT_SYMBOL(lprocfs_rd_state);
-
-int lprocfs_at_hist_helper(char *page, int count, int rc,
-                           struct adaptive_timeout *at)
-{
-        int i;
-        for (i = 0; i < AT_BINS; i++)
-                rc += snprintf(page + rc, count - rc, "%3u ", at->at_hist[i]);
-        rc += snprintf(page + rc, count - rc, "\n");
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_at_hist_helper);
-
-/* See also ptlrpc_lprocfs_rd_timeouts */
-int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count,
-                        int *eof, void *data)
-{
-        struct obd_device *obd = (struct obd_device *)data;
-        struct obd_import *imp;
-        unsigned int cur, worst;
-        time_t now, worstt;
-        struct dhms ts;
-        int i, rc = 0;
-
-        LASSERT(obd != NULL);
-        LPROCFS_CLIMP_CHECK(obd);
-        imp = obd->u.cli.cl_import;
-        *eof = 1;
-
-        now = cfs_time_current_sec();
-
-        /* Some network health info for kicks */
-        s2dhms(&ts, now - imp->imp_last_reply_time);
-        rc += snprintf(page + rc, count - rc,
-                       "%-10s : %ld, "DHMS_FMT" ago\n",
-                       "last reply", imp->imp_last_reply_time, DHMS_VARS(&ts));
-
-        cur = at_get(&imp->imp_at.iat_net_latency);
-        worst = imp->imp_at.iat_net_latency.at_worst_ever;
-        worstt = imp->imp_at.iat_net_latency.at_worst_time;
-        s2dhms(&ts, now - worstt);
-        rc += snprintf(page + rc, count - rc,
-                       "%-10s : cur %3u  worst %3u (at %ld, "DHMS_FMT" ago) ",
-                       "network", cur, worst, worstt, DHMS_VARS(&ts));
-        rc = lprocfs_at_hist_helper(page, count, rc,
-                                    &imp->imp_at.iat_net_latency);
-
-        for(i = 0; i < IMP_AT_MAX_PORTALS; i++) {
-                if (imp->imp_at.iat_portal[i] == 0)
-                        break;
-                cur = at_get(&imp->imp_at.iat_service_estimate[i]);
-                worst = imp->imp_at.iat_service_estimate[i].at_worst_ever;
-                worstt = imp->imp_at.iat_service_estimate[i].at_worst_time;
-                s2dhms(&ts, now - worstt);
-                rc += snprintf(page + rc, count - rc,
-                               "portal %-2d  : cur %3u  worst %3u (at %ld, "
-                               DHMS_FMT" ago) ", imp->imp_at.iat_portal[i],
-                               cur, worst, worstt, DHMS_VARS(&ts));
-                rc = lprocfs_at_hist_helper(page, count, rc,
-                                          &imp->imp_at.iat_service_estimate[i]);
-        }
-
-        LPROCFS_CLIMP_EXIT(obd);
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_rd_timeouts);
-
-int lprocfs_rd_connect_flags(char *page, char **start, off_t off,
-                             int count, int *eof, void *data)
-{
-        struct obd_device *obd = data;
-        __u64 flags;
-        int ret = 0;
-
-        LPROCFS_CLIMP_CHECK(obd);
-        flags = obd->u.cli.cl_import->imp_connect_data.ocd_connect_flags;
-        ret = snprintf(page, count, "flags="LPX64"\n", flags);
-        ret += obd_connect_flags2str(page + ret, count - ret, flags, "\n");
-        ret += snprintf(page + ret, count - ret, "\n");
-        LPROCFS_CLIMP_EXIT(obd);
-        return ret;
-}
-EXPORT_SYMBOL(lprocfs_rd_connect_flags);
-
-#ifdef HAVE_SERVER_SUPPORT
-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);
-#endif
-
-int lprocfs_rd_numrefs(char *page, char **start, off_t off, int count,
-                       int *eof, void *data)
-{
-        struct obd_type *class = (struct obd_type*) data;
-
-        LASSERT(class != NULL);
-        *eof = 1;
-        return snprintf(page, count, "%d\n", class->typ_refcnt);
-}
-EXPORT_SYMBOL(lprocfs_rd_numrefs);
-
-int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list)
-{
-       int rc = 0;
-
-       LASSERT(obd != NULL);
-       LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
-       LASSERT(obd->obd_type->typ_procroot != NULL);
-
-       obd->obd_proc_entry = lprocfs_register(obd->obd_name,
-                                              obd->obd_type->typ_procroot,
-                                              list, obd);
-       if (IS_ERR(obd->obd_proc_entry)) {
-               rc = PTR_ERR(obd->obd_proc_entry);
-               CERROR("error %d setting up lprocfs for %s\n",rc,obd->obd_name);
-               obd->obd_proc_entry = NULL;
-       }
-       return rc;
-}
-EXPORT_SYMBOL(lprocfs_obd_setup);
-#endif
-
-int
-lprocfs_seq_obd_setup(struct obd_device *obd)
-{
-       int rc = 0;
-
-       LASSERT(obd != NULL);
-       LASSERT(obd->obd_vars != NULL);
-       LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
-       LASSERT(obd->obd_type->typ_procroot != NULL);
-
-       obd->obd_proc_entry = lprocfs_seq_register(obd->obd_name,
-                                                  obd->obd_type->typ_procroot,
-                                                  obd->obd_vars, obd);
-       if (IS_ERR(obd->obd_proc_entry)) {
-               rc = PTR_ERR(obd->obd_proc_entry);
-               CERROR("error %d setting up lprocfs for %s\n",rc,obd->obd_name);
-               obd->obd_proc_entry = NULL;
-       }
-       return rc;
-}
-EXPORT_SYMBOL(lprocfs_seq_obd_setup);
-
-int lprocfs_obd_cleanup(struct obd_device *obd)
-{
-        if (!obd)
-                return -EINVAL;
-        if (obd->obd_proc_exports_entry) {
-                /* Should be no exports left */
-                lprocfs_remove(&obd->obd_proc_exports_entry);
-                obd->obd_proc_exports_entry = NULL;
-        }
-        if (obd->obd_proc_entry) {
-                lprocfs_remove(&obd->obd_proc_entry);
-                obd->obd_proc_entry = NULL;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(lprocfs_obd_cleanup);
-
-static void lprocfs_free_client_stats(struct nid_stat *client_stat)
-{
-       CDEBUG(D_CONFIG, "stat %p - data %p/%p\n", client_stat,
-              client_stat->nid_proc, client_stat->nid_stats);
-
-       LASSERTF(atomic_read(&client_stat->nid_exp_ref_count) == 0,
-                 "nid %s:count %d\n", libcfs_nid2str(client_stat->nid),
-                 atomic_read(&client_stat->nid_exp_ref_count));
-
-        if (client_stat->nid_proc)
-                lprocfs_remove(&client_stat->nid_proc);
-
-        if (client_stat->nid_stats)
-                lprocfs_free_stats(&client_stat->nid_stats);
-
-        if (client_stat->nid_ldlm_stats)
-                lprocfs_free_stats(&client_stat->nid_ldlm_stats);
-
-        OBD_FREE_PTR(client_stat);
-        return;
-
-}
-
-void lprocfs_free_per_client_stats(struct obd_device *obd)
-{
-        cfs_hash_t *hash = obd->obd_nid_stats_hash;
-        struct nid_stat *stat;
-        ENTRY;
-
-        /* we need extra list - because hash_exit called to early */
-        /* not need locking because all clients is died */
-        while (!cfs_list_empty(&obd->obd_nid_stats)) {
-                stat = cfs_list_entry(obd->obd_nid_stats.next,
-                                      struct nid_stat, nid_list);
-                cfs_list_del_init(&stat->nid_list);
-                cfs_hash_del(hash, &stat->nid, &stat->nid_hash);
-                lprocfs_free_client_stats(stat);
-        }
-        EXIT;
-}
-EXPORT_SYMBOL(lprocfs_free_per_client_stats);
-
-int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid)
-{
-       struct lprocfs_counter  *cntr;
-       unsigned int            percpusize;
-       int                     rc = -ENOMEM;
-       unsigned long           flags = 0;
-       int                     i;
-
-       LASSERT(stats->ls_percpu[cpuid] == NULL);
-       LASSERT((stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) == 0);
+       LASSERT(stats->ls_percpu[cpuid] == NULL);
+       LASSERT((stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) == 0);
 
        percpusize = lprocfs_stats_counter_size(stats);
        LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[cpuid], percpusize);
@@ -2161,8 +1179,9 @@ void lprocfs_clear_stats(struct lprocfs_stats *stats)
 }
 EXPORT_SYMBOL(lprocfs_clear_stats);
 
-static ssize_t lprocfs_stats_seq_write(struct file *file, const char *buf,
-                                       size_t len, loff_t *off)
+static ssize_t lprocfs_stats_seq_write(struct file *file,
+                                      const char __user *buf,
+                                      size_t len, loff_t *off)
 {
         struct seq_file *seq = file->private_data;
         struct lprocfs_stats *stats = seq->private;
@@ -2235,7 +1254,7 @@ out:
        return (rc < 0) ? rc : 0;
 }
 
-struct seq_operations lprocfs_stats_seq_sops = {
+static const struct seq_operations lprocfs_stats_seq_sops = {
        .start  = lprocfs_stats_seq_start,
        .stop   = lprocfs_stats_seq_stop,
        .next   = lprocfs_stats_seq_next,
@@ -2247,10 +1266,10 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file)
        struct seq_file *seq;
        int rc;
 
-#ifndef HAVE_ONLY_PROCFS_SEQ
-       if (LPROCFS_ENTRY_CHECK(PDE(inode)))
-               return -ENOENT;
-#endif
+       rc = LPROCFS_ENTRY_CHECK(inode);
+       if (rc < 0)
+               return rc;
+
        rc = seq_open(file, &lprocfs_stats_seq_sops);
        if (rc)
                return rc;
@@ -2259,7 +1278,7 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-struct file_operations lprocfs_stats_seq_fops = {
+static const struct file_operations lprocfs_stats_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = lprocfs_stats_seq_open,
         .read    = seq_read,
@@ -2318,118 +1337,6 @@ void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
 }
 EXPORT_SYMBOL(lprocfs_counter_init);
 
-#define LPROCFS_OBD_OP_INIT(base, stats, op)                               \
-do {                                                                       \
-        unsigned int coffset = base + OBD_COUNTER_OFFSET(op);              \
-        LASSERT(coffset < stats->ls_num);                                  \
-        lprocfs_counter_init(stats, coffset, 0, #op, "reqs");              \
-} while (0)
-
-void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)
-{
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, iocontrol);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_info);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, set_info_async);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, attach);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, detach);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, setup);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, precleanup);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, cleanup);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, process_config);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, postrecov);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, add_conn);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, del_conn);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, connect);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, reconnect);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, disconnect);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_init);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_fini);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_alloc);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, create);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, create_async);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr_async);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr);
-        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, llog_init);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_connect);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pin);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpin);
-        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, get_uuid);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotacheck);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotactl);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, ping);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_new);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_rem);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_add);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_del);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, getref);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, putref);
-
-       CLASSERT(NUM_OBD_STATS == OBD_COUNTER_OFFSET(putref) + 1);
-}
-EXPORT_SYMBOL(lprocfs_init_ops_stats);
-
-int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats)
-{
-        struct lprocfs_stats *stats;
-        unsigned int num_stats;
-        int rc, i;
-
-        LASSERT(obd->obd_stats == NULL);
-        LASSERT(obd->obd_proc_entry != NULL);
-        LASSERT(obd->obd_cntr_base == 0);
-
-       num_stats = NUM_OBD_STATS + num_private_stats;
-        stats = lprocfs_alloc_stats(num_stats, 0);
-        if (stats == NULL)
-                return -ENOMEM;
-
-        lprocfs_init_ops_stats(num_private_stats, stats);
-
-        for (i = num_private_stats; i < num_stats; i++) {
-                /* If this LBUGs, it is likely that an obd
-                 * operation was added to struct obd_ops in
-                 * <obd.h>, and that the corresponding line item
-                 * LPROCFS_OBD_OP_INIT(.., .., opname)
-                 * is missing from the list above. */
-               LASSERTF(stats->ls_cnt_header[i].lc_name != NULL,
-                         "Missing obd_stat initializer obd_op "
-                         "operation at offset %d.\n", i - num_private_stats);
-        }
-        rc = lprocfs_register_stats(obd->obd_proc_entry, "stats", stats);
-        if (rc < 0) {
-                lprocfs_free_stats(&stats);
-        } else {
-                obd->obd_stats  = stats;
-                obd->obd_cntr_base = num_private_stats;
-        }
-        return rc;
-}
-EXPORT_SYMBOL(lprocfs_alloc_obd_stats);
-
-void lprocfs_free_obd_stats(struct obd_device *obd)
-{
-        if (obd->obd_stats)
-                lprocfs_free_stats(&obd->obd_stats);
-}
-EXPORT_SYMBOL(lprocfs_free_obd_stats);
-
 /* Note that we only init md counters for ops whose offset is less
  * than NUM_MD_STATS. This is explained in a comment in the definition
  * of struct md_ops. */
@@ -2450,38 +1357,31 @@ void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats)
         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);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, done_writing);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, enqueue);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, getattr);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, getattr_name);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_lock);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, link);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, rename);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, is_subdir);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, setattr);
        LPROCFS_MD_OP_INIT(num_private_stats, stats, fsync);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, readpage);
-       LPROCFS_MD_OP_INIT(num_private_stats, stats, read_entry);
+       LPROCFS_MD_OP_INIT(num_private_stats, stats, read_page);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, unlink);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, setxattr);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, getxattr);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, init_ea_size);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, get_lustre_md);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, free_lustre_md);
-       LPROCFS_MD_OP_INIT(num_private_stats, stats, update_lsm_md);
        LPROCFS_MD_OP_INIT(num_private_stats, stats, merge_attr);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, set_open_replay_data);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, clear_open_replay_data);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, set_lock_data);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, lock_match);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, cancel_unused);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, renew_capa);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, unpack_capa);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, get_remote_perm);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_getattr_async);
         LPROCFS_MD_OP_INIT(num_private_stats, stats, revalidate_lock);
 }
-EXPORT_SYMBOL(lprocfs_init_mps_stats);
 
 int lprocfs_alloc_md_stats(struct obd_device *obd,
                           unsigned int num_private_stats)
@@ -2569,383 +1469,6 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats)
 }
 EXPORT_SYMBOL(lprocfs_init_ldlm_stats);
 
-#ifdef HAVE_SERVER_SUPPORT
-int lprocfs_exp_nid_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_export *exp = m->private;
-       LASSERT(exp != NULL);
-       return seq_printf(m, "%s\n", obd_export_nid2str(exp));
-}
-
-int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                               cfs_hlist_node_t *hnode, void *cb_data)
-
-{
-       struct obd_export *exp = cfs_hash_object(hs, hnode);
-       struct seq_file *m = cb_data;
-
-       if (exp->exp_nid_stats)
-               seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
-       return 0;
-}
-
-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;
-
-       cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-                               lprocfs_exp_print_uuid_seq, m);
-       return 0;
-}
-LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid);
-
-int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                               cfs_hlist_node_t *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) {
-               cfs_hash_debug_header_seq(m);
-               cfs_hash_debug_str_seq(hs, m);
-       }
-       return 0;
-}
-
-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;
-
-       cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-                               lprocfs_exp_print_hash_seq, m);
-       return 0;
-}
-LPROC_SEQ_FOPS_RO(lprocfs_exp_hash);
-
-int lprocfs_nid_stats_clear_seq_show(struct seq_file *m, void *data)
-{
-       return seq_printf(m, "%s\n", "Write into this file to clear all nid "
-                               "stats and stale nid entries");
-}
-EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_show);
-
-static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
-{
-       struct nid_stat *stat = obj;
-       ENTRY;
-
-       CDEBUG(D_INFO,"refcnt %d\n", atomic_read(&stat->nid_exp_ref_count));
-       if (atomic_read(&stat->nid_exp_ref_count) == 1) {
-               /* object has only hash references. */
-               spin_lock(&stat->nid_obd->obd_nid_lock);
-               cfs_list_move(&stat->nid_list, data);
-               spin_unlock(&stat->nid_obd->obd_nid_lock);
-               RETURN(1);
-       }
-       /* we has reference to object - only clear data*/
-       if (stat->nid_stats)
-               lprocfs_clear_stats(stat->nid_stats);
-
-       RETURN(0);
-}
-
-ssize_t
-lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
-                                       size_t count, loff_t *off)
-{
-       struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-       struct nid_stat *client_stat;
-       CFS_LIST_HEAD(free_list);
-
-       cfs_hash_cond_del(obd->obd_nid_stats_hash,
-                               lprocfs_nid_stats_clear_write_cb, &free_list);
-
-       while (!cfs_list_empty(&free_list)) {
-               client_stat = cfs_list_entry(free_list.next, struct nid_stat,
-                                               nid_list);
-               cfs_list_del_init(&client_stat->nid_list);
-               lprocfs_free_client_stats(client_stat);
-       }
-       return count;
-}
-EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_write);
-
-#ifndef HAVE_ONLY_PROCFS_SEQ
-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,
-                           cfs_hlist_node_t *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,
-                           cfs_hlist_node_t *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;
-        CFS_LIST_HEAD(free_list);
-
-        cfs_hash_cond_del(obd->obd_nid_stats_hash,
-                          lprocfs_nid_stats_clear_write_cb, &free_list);
-
-        while (!cfs_list_empty(&free_list)) {
-                client_stat = cfs_list_entry(free_list.next, struct nid_stat,
-                                             nid_list);
-                cfs_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)
-{
-        struct nid_stat *new_stat, *old_stat;
-        struct obd_device *obd = NULL;
-        cfs_proc_dir_entry_t *entry;
-        char *buffer = NULL;
-        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);
-
-        /* 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);
-
-       spin_lock(&exp->exp_lock);
-       if (exp->exp_nid_stats != NULL) {
-               spin_unlock(&exp->exp_lock);
-               RETURN(-EALREADY);
-       }
-       spin_unlock(&exp->exp_lock);
-
-        obd = exp->exp_obd;
-
-        CDEBUG(D_CONFIG, "using hash %p\n", obd->obd_nid_stats_hash);
-
-        OBD_ALLOC_PTR(new_stat);
-        if (new_stat == NULL)
-                RETURN(-ENOMEM);
-
-        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",
-               old_stat, libcfs_nid2str(*nid),
-              atomic_read(&new_stat->nid_exp_ref_count));
-
-       /* Return -EALREADY here so that we know that the /proc
-        * entry already has been created */
-       if (old_stat != new_stat) {
-               spin_lock(&exp->exp_lock);
-               if (exp->exp_nid_stats) {
-                       LASSERT(exp->exp_nid_stats == old_stat);
-                       nidstat_putref(exp->exp_nid_stats);
-               }
-               exp->exp_nid_stats = old_stat;
-               spin_unlock(&exp->exp_lock);
-               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,
-                                               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",
-                      obd->obd_name, libcfs_nid2str(*nid), 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);
-#endif
-        if (IS_ERR(entry)) {
-                CWARN("Error adding the NID stats file\n");
-                rc = PTR_ERR(entry);
-                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);
-#endif
-        if (IS_ERR(entry)) {
-                CWARN("Error adding the hash file\n");
-                rc = PTR_ERR(entry);
-                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);
-       cfs_list_add(&new_stat->nid_list, &obd->obd_nid_stats);
-       spin_unlock(&obd->obd_nid_lock);
-
-        RETURN(rc);
-
-destroy_new_ns:
-        if (new_stat->nid_proc != NULL)
-                lprocfs_remove(&new_stat->nid_proc);
-        cfs_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash);
-
-destroy_new:
-        nidstat_putref(new_stat);
-        OBD_FREE_PTR(new_stat);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(lprocfs_exp_setup);
-#endif
-
-int lprocfs_exp_cleanup(struct obd_export *exp)
-{
-        struct nid_stat *stat = exp->exp_nid_stats;
-
-        if(!stat || !exp->exp_obd)
-                RETURN(0);
-
-        nidstat_putref(exp->exp_nid_stats);
-        exp->exp_nid_stats = NULL;
-
-        return 0;
-}
-EXPORT_SYMBOL(lprocfs_exp_cleanup);
-
 __s64 lprocfs_read_helper(struct lprocfs_counter *lc,
                          struct lprocfs_counter_header *header,
                          enum lprocfs_stats_flags flags,
@@ -2987,14 +1510,14 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc,
 }
 EXPORT_SYMBOL(lprocfs_read_helper);
 
-int lprocfs_write_helper(const char *buffer, unsigned long count,
+int lprocfs_write_helper(const char __user *buffer, unsigned long count,
                          int *val)
 {
         return lprocfs_write_frac_helper(buffer, count, val, 1);
 }
 EXPORT_SYMBOL(lprocfs_write_helper);
 
-int lprocfs_write_frac_helper(const char *buffer, unsigned long count,
+int lprocfs_write_frac_helper(const char __user *buffer, unsigned long count,
                               int *val, int mult)
 {
         char kernbuf[20], *end, *pbuf;
@@ -3090,7 +1613,6 @@ int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val,
         buffer[prtn++] ='\n';
         return prtn;
 }
-EXPORT_SYMBOL(lprocfs_read_frac_helper);
 
 int lprocfs_seq_read_frac_helper(struct seq_file *m, long val, int mult)
 {
@@ -3117,14 +1639,16 @@ int lprocfs_seq_read_frac_helper(struct seq_file *m, long val, int mult)
 }
 EXPORT_SYMBOL(lprocfs_seq_read_frac_helper);
 
-int lprocfs_write_u64_helper(const char *buffer, unsigned long count,__u64 *val)
+int lprocfs_write_u64_helper(const char __user *buffer, unsigned long count,
+                            __u64 *val)
 {
         return lprocfs_write_frac_u64_helper(buffer, count, val, 1);
 }
 EXPORT_SYMBOL(lprocfs_write_u64_helper);
 
-int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count,
-                              __u64 *val, int mult)
+int lprocfs_write_frac_u64_helper(const char __user *buffer,
+                                 unsigned long count,
+                                 __u64 *val, int mult)
 {
         char kernbuf[22], *end, *pbuf;
         __u64 whole, frac = 0, units;
@@ -3177,7 +1701,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count,
                }
        }
         /* Specified units override the multiplier */
-        if (units)
+       if (units > 1)
                 mult = mult < 0 ? -units : units;
 
         frac *= mult;
@@ -3233,7 +1757,7 @@ char *lprocfs_find_named_value(const char *buffer, const char *name,
 }
 EXPORT_SYMBOL(lprocfs_find_named_value);
 
-int lprocfs_seq_create(cfs_proc_dir_entry_t *parent,
+int lprocfs_seq_create(struct proc_dir_entry *parent,
                       const char *name,
                       mode_t mode,
                       const struct file_operations *seq_fops,
@@ -3281,7 +1805,7 @@ void lprocfs_oh_tally_log2(struct obd_histogram *oh, unsigned int value)
        unsigned int val = 0;
 
        if (likely(value != 0))
-               val = min_t(unsigned int, __fls(value - 1), OBD_HIST_MAX);
+               val = min(fls(value - 1), OBD_HIST_MAX);
 
        lprocfs_oh_tally(oh, val);
 }
@@ -3306,447 +1830,165 @@ void lprocfs_oh_clear(struct obd_histogram *oh)
 }
 EXPORT_SYMBOL(lprocfs_oh_clear);
 
-#ifdef HAVE_SERVER_SUPPORT
-int lprocfs_hash_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-       int c = 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);
-       return c;
-}
-EXPORT_SYMBOL(lprocfs_hash_seq_show);
-
-int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-
-       LASSERT(obd != NULL);
-
-       seq_printf(m, "status: \n");
-       if (obd->obd_max_recoverable_clients == 0) {
-               seq_printf(m, "INACTIVE\n");
-               goto out;
-       }
-
-       /* sampled unlocked, but really... */
-       if (obd->obd_recovering == 0) {
-               seq_printf(m, "COMPLETE\n");
-               seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-               seq_printf(m, "recovery_duration: %lu\n",
-                               obd->obd_recovery_end - obd->obd_recovery_start);
-               /* Number of clients that have completed recovery */
-               seq_printf(m, "completed_clients: %d/%d\n",
-                               obd->obd_max_recoverable_clients -
-                               obd->obd_stale_clients,
-                               obd->obd_max_recoverable_clients);
-               seq_printf(m, "replayed_requests: %d\n",
-                               obd->obd_replayed_requests);
-               seq_printf(m, "last_transno: "LPD64"\n",
-                               obd->obd_next_recovery_transno - 1);
-               seq_printf(m, "VBR: %s\n", obd->obd_version_recov ?
-                               "ENABLED" : "DISABLED");
-               seq_printf(m, "IR: %s\n", obd->obd_no_ir ?
-                               "DISABLED" : "ENABLED");
-               goto out;
-       }
-
-       seq_printf(m, "RECOVERING\n");
-       seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-       seq_printf(m, "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());
-       seq_printf(m, "connected_clients: %d/%d\n",
-                       atomic_read(&obd->obd_connected_clients),
-                       obd->obd_max_recoverable_clients);
-       /* Number of clients that have completed recovery */
-       seq_printf(m, "req_replay_clients: %d\n",
-                       atomic_read(&obd->obd_req_replay_clients));
-       seq_printf(m, "lock_repay_clients: %d\n",
-                       atomic_read(&obd->obd_lock_replay_clients));
-       seq_printf(m, "completed_clients: %d\n",
-                       atomic_read(&obd->obd_connected_clients) -
-                       atomic_read(&obd->obd_lock_replay_clients));
-       seq_printf(m, "evicted_clients: %d\n", obd->obd_stale_clients);
-       seq_printf(m, "replayed_requests: %d\n", obd->obd_replayed_requests);
-       seq_printf(m, "queued_requests: %d\n",
-                       obd->obd_requests_queued_for_recovery);
-       seq_printf(m, "next_transno: "LPD64"\n",
-                       obd->obd_next_recovery_transno);
-out:
-       return 0;
-}
-EXPORT_SYMBOL(lprocfs_recovery_status_seq_show);
-
-int lprocfs_ir_factor_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-
-       LASSERT(obd != NULL);
-       return seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
-}
-EXPORT_SYMBOL(lprocfs_ir_factor_seq_show);
-
-ssize_t
-lprocfs_ir_factor_seq_write(struct file *file, const char *buffer,
-                               size_t count, loff_t *off)
-{
-       struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-       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_ir_factor_seq_write);
-
-int lprocfs_recovery_time_soft_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-
-       LASSERT(obd != NULL);
-       return seq_printf(m, "%d\n", obd->obd_recovery_timeout);
-}
-EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
-
-ssize_t
-lprocfs_recovery_time_soft_seq_write(struct file *file, const char *buffer,
-                                       size_t count, loff_t *off)
-{
-       struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-       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_recovery_time_soft_seq_write);
-
-int lprocfs_recovery_time_hard_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-
-       LASSERT(obd != NULL);
-       return seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
-}
-EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);
-
-ssize_t
-lprocfs_recovery_time_hard_seq_write(struct file *file, const char *buffer,
-                                       size_t count, loff_t *off)
-{
-       struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-       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_recovery_time_hard_seq_write);
-
-int lprocfs_target_instance_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
-       struct obd_device_target *target = &obd->u.obt;
-
-       LASSERT(obd != NULL);
-       LASSERT(target->obt_magic == OBT_MAGIC);
-       return seq_printf(m, "%u\n", obd->u.obt.obt_instance);
-}
-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)
+int lprocfs_obd_rd_max_pages_per_rpc(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;
-        }
+       struct obd_device *dev = data;
+       struct client_obd *cli = &dev->u.cli;
+       int rc;
 
-        /* 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;
-        }
+       spin_lock(&cli->cl_loi_list_lock);
+       rc = snprintf(page, count, "%d\n", cli->cl_max_pages_per_rpc);
+       spin_unlock(&cli->cl_loi_list_lock);
 
-        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);
+       return rc;
 }
-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)
+int lprocfs_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *data)
 {
-        struct obd_device *obd = (struct obd_device *)data;
-        LASSERT(obd != NULL);
+       struct obd_device *dev = data;
+       struct client_obd *cli = &dev->u.cli;
+       int rc;
 
-        return snprintf(page, count, "%d\n",
-                        obd->obd_recovery_ir_factor);
+       spin_lock(&cli->cl_loi_list_lock);
+       rc = seq_printf(m, "%d\n", cli->cl_max_pages_per_rpc);
+       spin_unlock(&cli->cl_loi_list_lock);
+       return rc;
 }
-EXPORT_SYMBOL(lprocfs_obd_rd_ir_factor);
+EXPORT_SYMBOL(lprocfs_obd_max_pages_per_rpc_seq_show);
 
-int lprocfs_obd_wr_ir_factor(struct file *file, const char *buffer,
-                             unsigned long count, void *data)
+int lprocfs_wr_root_squash(const char __user *buffer, unsigned long count,
+                          struct root_squash_info *squash, char *name)
 {
-        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 rc;
+       char kernbuf[64], *tmp, *errmsg;
+       unsigned long uid, gid;
+       ENTRY;
 
-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);
+       if (count >= sizeof(kernbuf)) {
+               errmsg = "string too long";
+               GOTO(failed_noprint, rc = -EINVAL);
+       }
+       if (copy_from_user(kernbuf, buffer, count)) {
+               errmsg = "bad address";
+               GOTO(failed_noprint, rc = -EFAULT);
+       }
+       kernbuf[count] = '\0';
 
-        return snprintf(page, count, "%d\n",
-                        obd->obd_recovery_timeout);
-}
-EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_soft);
+       /* look for uid gid separator */
+       tmp = strchr(kernbuf, ':');
+       if (tmp == NULL) {
+               errmsg = "needs uid:gid format";
+               GOTO(failed, rc = -EINVAL);
+       }
+       *tmp = '\0';
+       tmp++;
 
-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);
+       /* parse uid */
+       if (kstrtoul(kernbuf, 0, &uid) != 0) {
+               errmsg = "bad uid";
+               GOTO(failed, rc = -EINVAL);
+       }
 
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+       /* parse gid */
+       if (kstrtoul(tmp, 0, &gid) != 0) {
+               errmsg = "bad gid";
+               GOTO(failed, rc = -EINVAL);
+       }
 
-        obd->obd_recovery_timeout = val;
-        return count;
-}
-EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_soft);
+       squash->rsi_uid = uid;
+       squash->rsi_gid = gid;
 
-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);
+       LCONSOLE_INFO("%s: root_squash is set to %u:%u\n",
+                     name, squash->rsi_uid, squash->rsi_gid);
+       RETURN(count);
 
-        return snprintf(page, count, "%u\n", obd->obd_recovery_time_hard);
+failed:
+       if (tmp != NULL) {
+               tmp--;
+               *tmp = ':';
+       }
+       CWARN("%s: failed to set root_squash to \"%s\", %s, rc = %d\n",
+             name, kernbuf, errmsg, rc);
+       RETURN(rc);
+failed_noprint:
+       CWARN("%s: failed to set root_squash due to %s, rc = %d\n",
+             name, errmsg, rc);
+       RETURN(rc);
 }
-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;
+EXPORT_SYMBOL(lprocfs_wr_root_squash);
 
-        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)
+int lprocfs_wr_nosquash_nids(const char __user *buffer, unsigned long count,
+                            struct root_squash_info *squash, char *name)
 {
-       struct obd_device *obd = (struct obd_device *)data;
-       struct obd_device_target *target = &obd->u.obt;
+       int rc;
+       char *kernbuf = NULL;
+       char *errmsg;
+       struct list_head tmp;
+       int len = count;
+       ENTRY;
 
-       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 /* HAVE_SERVER_SUPPORT */
+       if (count > 4096) {
+               errmsg = "string too long";
+               GOTO(failed, rc = -EINVAL);
+       }
 
-int lprocfs_obd_rd_max_pages_per_rpc(char *page, char **start, off_t off,
-                                     int count, int *eof, void *data)
-{
-        struct obd_device *dev = data;
-        struct client_obd *cli = &dev->u.cli;
-        int rc;
+       OBD_ALLOC(kernbuf, count + 1);
+       if (kernbuf == NULL) {
+               errmsg = "no memory";
+               GOTO(failed, rc = -ENOMEM);
+       }
+       if (copy_from_user(kernbuf, buffer, count)) {
+               errmsg = "bad address";
+               GOTO(failed, rc = -EFAULT);
+       }
+       kernbuf[count] = '\0';
+
+       if (count > 0 && kernbuf[count - 1] == '\n')
+               len = count - 1;
+
+       if ((len == 4 && strncmp(kernbuf, "NONE", len) == 0) ||
+           (len == 5 && strncmp(kernbuf, "clear", len) == 0)) {
+               /* empty string is special case */
+               down_write(&squash->rsi_sem);
+               if (!list_empty(&squash->rsi_nosquash_nids))
+                       cfs_free_nidlist(&squash->rsi_nosquash_nids);
+               up_write(&squash->rsi_sem);
+               LCONSOLE_INFO("%s: nosquash_nids is cleared\n", name);
+               OBD_FREE(kernbuf, count + 1);
+               RETURN(count);
+       }
 
-        client_obd_list_lock(&cli->cl_loi_list_lock);
-        rc = snprintf(page, count, "%d\n", cli->cl_max_pages_per_rpc);
-        client_obd_list_unlock(&cli->cl_loi_list_lock);
-        return rc;
+       INIT_LIST_HEAD(&tmp);
+       if (cfs_parse_nidlist(kernbuf, count, &tmp) <= 0) {
+               errmsg = "can't parse";
+               GOTO(failed, rc = -EINVAL);
+       }
+       LCONSOLE_INFO("%s: nosquash_nids set to %s\n",
+                     name, kernbuf);
+       OBD_FREE(kernbuf, count + 1);
+       kernbuf = NULL;
+
+       down_write(&squash->rsi_sem);
+       if (!list_empty(&squash->rsi_nosquash_nids))
+               cfs_free_nidlist(&squash->rsi_nosquash_nids);
+       list_splice(&tmp, &squash->rsi_nosquash_nids);
+       up_write(&squash->rsi_sem);
+
+       RETURN(count);
+
+failed:
+       if (kernbuf) {
+               CWARN("%s: failed to set nosquash_nids to \"%s\", %s rc = %d\n",
+                     name, kernbuf, errmsg, rc);
+               OBD_FREE(kernbuf, count + 1);
+       } else {
+               CWARN("%s: failed to set nosquash_nids due to %s rc = %d\n",
+                     name, errmsg, rc);
+       }
+       RETURN(rc);
 }
-EXPORT_SYMBOL(lprocfs_obd_rd_max_pages_per_rpc);
-
-int lprocfs_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *dev = data;
-       struct client_obd *cli = &dev->u.cli;
-       int rc;
+EXPORT_SYMBOL(lprocfs_wr_nosquash_nids);
 
-       client_obd_list_lock(&cli->cl_loi_list_lock);
-       rc = seq_printf(m, "%d\n", cli->cl_max_pages_per_rpc);
-       client_obd_list_unlock(&cli->cl_loi_list_lock);
-       return rc;
-}
-EXPORT_SYMBOL(lprocfs_obd_max_pages_per_rpc_seq_show);
-#endif /* LPROCFS*/
+#endif /* CONFIG_PROC_FS*/