Whamcloud - gitweb
LU-6557 llite: remove unused ll_max_rw_chunk
[fs/lustre-release.git] / lustre / llite / lproc_llite.c
index 56b8d1a..7e84cfe 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <linux/version.h>
-#include <lustre_lite.h>
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
+#include <lustre_param.h>
 #include <lprocfs_status.h>
-#include <linux/seq_file.h>
 #include <obd_support.h>
 
 #include "llite_internal.h"
+#include "vvp_internal.h"
 
 struct proc_dir_entry *proc_lustre_fs_root;
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 /* /proc/lustre/llite mount point registration */
-struct file_operations llite_dump_pgcache_fops;
-struct file_operations ll_ra_stats_fops;
-struct file_operations ll_rw_extents_stats_fops;
-struct file_operations ll_rw_extents_stats_pp_fops;
-struct file_operations ll_rw_offset_stats_fops;
-
-static int ll_rd_blksize(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
-{
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                OBD_STATFS_NODELAY);
-        if (!rc) {
-              *eof = 1;
-              rc = snprintf(page, count, "%u\n", osfs.os_bsize);
-        }
+static const struct file_operations ll_rw_extents_stats_fops;
+static const struct file_operations ll_rw_extents_stats_pp_fops;
+static const struct file_operations ll_rw_offset_stats_fops;
 
-        return rc;
+static int ll_blksize_seq_show(struct seq_file *m, void *v)
+{
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &osfs,
+                               cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
+                               OBD_STATFS_NODELAY);
+       if (!rc)
+               rc = seq_printf(m, "%u\n", osfs.os_bsize);
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_blksize);
 
-static int ll_rd_kbytestotal(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int ll_kbytestotal_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                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);
-        }
-        return rc;
-
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &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;
+
+               rc = seq_printf(m, LPU64"\n", result);
+       }
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_kbytestotal);
 
-static int ll_rd_kbytesfree(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static int ll_kbytesfree_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                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;
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &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;
+
+               rc = seq_printf(m, LPU64"\n", result);
+       }
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_kbytesfree);
 
-static int ll_rd_kbytesavail(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int ll_kbytesavail_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                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;
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &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;
+
+               rc = seq_printf(m, LPU64"\n", result);
+       }
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_kbytesavail);
 
-static int ll_rd_filestotal(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static int ll_filestotal_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                OBD_STATFS_NODELAY);
-        if (!rc) {
-                 *eof = 1;
-                 rc = snprintf(page, count, LPU64"\n", osfs.os_files);
-        }
-        return rc;
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &osfs,
+                               cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
+                               OBD_STATFS_NODELAY);
+       if (!rc)
+               rc = seq_printf(m, LPU64"\n", osfs.os_files);
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_filestotal);
 
-static int ll_rd_filesfree(char *page, char **start, off_t off, int count,
-                           int *eof, void *data)
+static int ll_filesfree_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
-        struct obd_statfs osfs;
-        int rc;
-
-        LASSERT(sb != NULL);
-        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ,
-                                OBD_STATFS_NODELAY);
-        if (!rc) {
-                 *eof = 1;
-                 rc = snprintf(page, count, LPU64"\n", osfs.os_ffree);
-        }
-        return rc;
-
+       struct super_block *sb = m->private;
+       struct obd_statfs osfs;
+       int rc;
+
+       LASSERT(sb != NULL);
+       rc = ll_statfs_internal(sb, &osfs,
+                               cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
+                               OBD_STATFS_NODELAY);
+       if (!rc)
+               rc = seq_printf(m, LPU64"\n", osfs.os_ffree);
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_filesfree);
 
-static int ll_rd_client_type(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static int ll_client_type_seq_show(struct seq_file *m, void *v)
 {
-        struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)data);
-        int rc;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
+       int rc;
 
-        LASSERT(sbi != NULL);
-
-        *eof = 1;
-        if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
-                rc = snprintf(page, count, "remote client\n");
-        else
-                rc = snprintf(page, count, "local client\n");
+       LASSERT(sbi != NULL);
 
-        return rc;
+       if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
+               rc = seq_printf(m, "remote client\n");
+       else
+               rc = seq_printf(m, "local client\n");
+       return rc;
 }
+LPROC_SEQ_FOPS_RO(ll_client_type);
 
-static int ll_rd_fstype(char *page, char **start, off_t off, int count,
-                        int *eof, void *data)
+static int ll_fstype_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block*)data;
+       struct super_block *sb = m->private;
 
-        LASSERT(sb != NULL);
-        *eof = 1;
-        return snprintf(page, count, "%s\n", sb->s_type->name);
+       LASSERT(sb != NULL);
+       return seq_printf(m, "%s\n", sb->s_type->name);
 }
+LPROC_SEQ_FOPS_RO(ll_fstype);
 
-static int ll_rd_sb_uuid(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
+static int ll_sb_uuid_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = (struct super_block *)data;
+       struct super_block *sb = m->private;
 
-        LASSERT(sb != NULL);
-        *eof = 1;
-        return snprintf(page, count, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid);
+       LASSERT(sb != NULL);
+       return seq_printf(m, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid);
 }
+LPROC_SEQ_FOPS_RO(ll_sb_uuid);
 
-static int ll_rd_max_readahead_mb(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data)
+static int ll_xattr_cache_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
 
-        spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_ra_info.ra_max_pages;
-        spin_unlock(&sbi->ll_lock);
-
-        mult = 1 << (20 - PAGE_CACHE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+       return seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled);
 }
 
-static int ll_wr_max_readahead_mb(struct file *file, const char *buffer,
-                                   unsigned long count, void *data)
+static ssize_t ll_xattr_cache_seq_write(struct file *file,
+                                       const char __user *buffer,
+                                       size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        int mult, rc, pages_number;
+       struct seq_file *m = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
+       int val, rc;
 
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
-        if (rc)
-                return rc;
+       rc = lprocfs_write_helper(buffer, count, &val);
+       if (rc)
+               return rc;
 
-        if (pages_number < 0 || pages_number > num_physpages / 2) {
-                CERROR("can't set file readahead more than %lu MB\n",
-                        num_physpages >> (20 - CFS_PAGE_SHIFT + 1)); /*1/2 of RAM*/
-                return -ERANGE;
-        }
+       if (val != 0 && val != 1)
+               return -ERANGE;
 
-        spin_lock(&sbi->ll_lock);
-        sbi->ll_ra_info.ra_max_pages = pages_number;
-        spin_unlock(&sbi->ll_lock);
+       if (val == 1 && !(sbi->ll_flags & LL_SBI_XATTR_CACHE))
+               return -ENOTSUPP;
 
-        return count;
+       sbi->ll_xattr_cache_enabled = val;
+
+       return count;
 }
+LPROC_SEQ_FOPS(ll_xattr_cache);
 
-static int ll_rd_max_read_ahead_whole_mb(char *page, char **start, off_t off,
-                                       int count, int *eof, void *data)
+static int ll_site_stats_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct super_block *sb = m->private;
 
-        spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
-        spin_unlock(&sbi->ll_lock);
-
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+       /*
+        * See description of statistical counters in struct cl_site, and
+        * struct lu_site.
+        */
+       return cl_site_stats_print(lu2cl_site(ll_s2sbi(sb)->ll_site), m);
 }
+LPROC_SEQ_FOPS_RO(ll_site_stats);
 
-static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer,
-                                       unsigned long count, void *data)
+static int ll_max_readahead_mb_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        int mult, rc, pages_number;
-
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
-        if (rc)
-                return rc;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        /* Cap this at the current max readahead window size, the readahead
-         * algorithm does this anyway so it's pointless to set it larger. */
-        if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) {
-                CERROR("can't set max_read_ahead_whole_mb more than "
-                       "max_read_ahead_mb: %lu\n",
-                       sbi->ll_ra_info.ra_max_pages >> (20 - CFS_PAGE_SHIFT));
-                return -ERANGE;
-        }
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_pages;
+       spin_unlock(&sbi->ll_lock);
 
-        spin_lock(&sbi->ll_lock);
-        sbi->ll_ra_info.ra_max_read_ahead_whole_pages = pages_number;
-        spin_unlock(&sbi->ll_lock);
+       mult = 1 << (20 - PAGE_CACHE_SHIFT);
+       return lprocfs_seq_read_frac_helper(m, pages_number, mult);
+}
 
-        return count;
+static ssize_t
+ll_max_readahead_mb_seq_write(struct file *file, const char __user *buffer,
+                             size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       __u64 val;
+       long pages_number;
+       int pages_shift;
+       int rc;
+
+       pages_shift = 20 - PAGE_CACHE_SHIFT;
+       rc = lprocfs_write_frac_u64_helper(buffer, count, &val,
+                                          1 << pages_shift);
+       if (rc)
+               return rc;
+
+       if (val > LONG_MAX)
+               return -ERANGE;
+       pages_number = (long)val;
+
+       if (pages_number < 0 || pages_number > totalram_pages / 2) {
+               /* 1/2 of RAM */
+               CERROR("%s: can't set max_readahead_mb=%lu > %luMB\n",
+                      ll_get_fsname(sb, NULL, 0), pages_number >> pages_shift,
+                      totalram_pages >> (pages_shift + 1));
+               return -ERANGE;
+       }
+
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_pages = pages_number;
+       spin_unlock(&sbi->ll_lock);
+       return count;
 }
+LPROC_SEQ_FOPS(ll_max_readahead_mb);
 
-static int ll_rd_max_cached_mb(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int ll_max_readahead_per_file_mb_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        long pages_number;
-        int mult;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        spin_lock(&sbi->ll_lock);
-        pages_number = sbi->ll_async_page_max;
-        spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_pages_per_file;
+       spin_unlock(&sbi->ll_lock);
 
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        return lprocfs_read_frac_helper(page, count, pages_number, mult);;
+       mult = 1 << (20 - PAGE_CACHE_SHIFT);
+       return lprocfs_seq_read_frac_helper(m, pages_number, mult);
 }
 
-static int ll_wr_max_cached_mb(struct file *file, const char *buffer,
-                                  unsigned long count, void *data)
+static ssize_t
+ll_max_readahead_per_file_mb_seq_write(struct file *file,
+                                      const char __user *buffer,
+                                      size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        int mult, rc, pages_number;
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       int pages_shift, rc, pages_number;
+
+       pages_shift = 20 - PAGE_CACHE_SHIFT;
+       rc = lprocfs_write_frac_helper(buffer, count, &pages_number,
+                                      1 << pages_shift);
+       if (rc)
+               return rc;
+
+       if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) {
+               CERROR("%s: can't set max_readahead_per_file_mb=%u > "
+                      "max_read_ahead_mb=%lu\n", ll_get_fsname(sb, NULL, 0),
+                      pages_number >> pages_shift,
+                      sbi->ll_ra_info.ra_max_pages >> pages_shift);
+               return -ERANGE;
+       }
+
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_pages_per_file = pages_number;
+       spin_unlock(&sbi->ll_lock);
+       return count;
+}
+LPROC_SEQ_FOPS(ll_max_readahead_per_file_mb);
 
-        mult = 1 << (20 - CFS_PAGE_SHIFT);
-        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
-        if (rc)
-                return rc;
+static int ll_max_read_ahead_whole_mb_seq_show(struct seq_file *m, void *v)
+{
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       long pages_number;
+       int mult;
 
-        if (pages_number < 0 || pages_number > num_physpages) {
-                CERROR("can't set max cache more than %lu MB\n",
-                        num_physpages >> (20 - CFS_PAGE_SHIFT));
-                return -ERANGE;
-        }
+       spin_lock(&sbi->ll_lock);
+       pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
+       spin_unlock(&sbi->ll_lock);
 
-        spin_lock(&sbi->ll_lock);
-        sbi->ll_async_page_max = pages_number ;
-        spin_unlock(&sbi->ll_lock);
-        
-        if (!sbi->ll_dt_exp)
-                /* Not set up yet, don't call llap_shrink_cache */
-                return count;
+       mult = 1 << (20 - PAGE_CACHE_SHIFT);
+       return lprocfs_seq_read_frac_helper(m, pages_number, mult);
+}
 
-        if (sbi->ll_async_page_count >= sbi->ll_async_page_max)
-                llap_shrink_cache(sbi, 0);
+static ssize_t
+ll_max_read_ahead_whole_mb_seq_write(struct file *file,
+                                    const char __user *buffer,
+                                    size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       int pages_shift, rc, pages_number;
+
+       pages_shift = 20 - PAGE_CACHE_SHIFT;
+       rc = lprocfs_write_frac_helper(buffer, count, &pages_number,
+                                      1 << pages_shift);
+       if (rc)
+               return rc;
+
+       /* Cap this at the current max readahead window size, the readahead
+        * algorithm does this anyway so it's pointless to set it larger. */
+       if (pages_number < 0 ||
+           pages_number > sbi->ll_ra_info.ra_max_pages_per_file) {
+               CERROR("%s: can't set max_read_ahead_whole_mb=%u > "
+                      "max_read_ahead_per_file_mb=%lu\n",
+                      ll_get_fsname(sb, NULL, 0),
+                      pages_number >> pages_shift,
+                      sbi->ll_ra_info.ra_max_pages_per_file >> pages_shift);
+               return -ERANGE;
+       }
+
+       spin_lock(&sbi->ll_lock);
+       sbi->ll_ra_info.ra_max_read_ahead_whole_pages = pages_number;
+       spin_unlock(&sbi->ll_lock);
+       return count;
+}
+LPROC_SEQ_FOPS(ll_max_read_ahead_whole_mb);
 
-        return count;
+static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v)
+{
+       struct super_block     *sb    = m->private;
+       struct ll_sb_info      *sbi   = ll_s2sbi(sb);
+       struct cl_client_cache *cache = sbi->ll_cache;
+       int shift = 20 - PAGE_CACHE_SHIFT;
+       long max_cached_mb;
+       long unused_mb;
+
+       max_cached_mb = cache->ccc_lru_max >> shift;
+       unused_mb = atomic_long_read(&cache->ccc_lru_left) >> shift;
+       return seq_printf(m,
+                       "users: %d\n"
+                       "max_cached_mb: %ld\n"
+                       "used_mb: %ld\n"
+                       "unused_mb: %ld\n"
+                       "reclaim_count: %u\n",
+                       atomic_read(&cache->ccc_users),
+                       max_cached_mb,
+                       max_cached_mb - unused_mb,
+                       unused_mb,
+                       cache->ccc_lru_shrinkers);
+}
+
+static ssize_t
+ll_max_cached_mb_seq_write(struct file *file, const char __user *buffer,
+                          size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct cl_client_cache *cache = sbi->ll_cache;
+       struct lu_env *env;
+       __u64 val;
+       long diff = 0;
+       long nrpages = 0;
+       long pages_number;
+       int refcheck;
+       int mult;
+       long rc;
+       char kernbuf[128];
+       ENTRY;
+
+       if (count >= sizeof(kernbuf))
+               RETURN(-EINVAL);
+
+       if (copy_from_user(kernbuf, buffer, count))
+               RETURN(-EFAULT);
+       kernbuf[count] = 0;
+
+       mult = 1 << (20 - PAGE_CACHE_SHIFT);
+       buffer += lprocfs_find_named_value(kernbuf, "max_cached_mb:", &count) -
+                 kernbuf;
+       rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult);
+       if (rc)
+               RETURN(rc);
+
+       if (val > LONG_MAX)
+               return -ERANGE;
+       pages_number = (long)val;
+
+       if (pages_number < 0 || pages_number > totalram_pages) {
+               CERROR("%s: can't set max cache more than %lu MB\n",
+                      ll_get_fsname(sb, NULL, 0),
+                      totalram_pages >> (20 - PAGE_CACHE_SHIFT));
+               RETURN(-ERANGE);
+       }
+       /* Allow enough cache so clients can make well-formed RPCs */
+       pages_number = max_t(long, pages_number, PTLRPC_MAX_BRW_PAGES);
+
+       spin_lock(&sbi->ll_lock);
+       diff = pages_number - cache->ccc_lru_max;
+       spin_unlock(&sbi->ll_lock);
+
+       /* easy - add more LRU slots. */
+       if (diff >= 0) {
+               atomic_long_add(diff, &cache->ccc_lru_left);
+               GOTO(out, rc = 0);
+       }
+
+       env = cl_env_get(&refcheck);
+       if (IS_ERR(env))
+               RETURN(rc);
+
+       diff = -diff;
+       while (diff > 0) {
+               long tmp;
+
+               /* reduce LRU budget from free slots. */
+               do {
+                       long ov, nv;
+
+                       ov = atomic_long_read(&cache->ccc_lru_left);
+                       if (ov == 0)
+                               break;
+
+                       nv = ov > diff ? ov - diff : 0;
+                       rc = atomic_long_cmpxchg(&cache->ccc_lru_left, ov, nv);
+                       if (likely(ov == rc)) {
+                               diff -= ov - nv;
+                               nrpages += ov - nv;
+                               break;
+                       }
+               } while (1);
+
+               if (diff <= 0)
+                       break;
+
+               if (sbi->ll_dt_exp == NULL) { /* being initialized */
+                       rc = -ENODEV;
+                       break;
+               }
+
+               /* difficult - have to ask OSCs to drop LRU slots. */
+               tmp = diff << 1;
+               rc = obd_set_info_async(env, sbi->ll_dt_exp,
+                               sizeof(KEY_CACHE_LRU_SHRINK),
+                               KEY_CACHE_LRU_SHRINK,
+                               sizeof(tmp), &tmp, NULL);
+               if (rc < 0)
+                       break;
+       }
+       cl_env_put(env, &refcheck);
+
+out:
+       if (rc >= 0) {
+               spin_lock(&sbi->ll_lock);
+               cache->ccc_lru_max = pages_number;
+               spin_unlock(&sbi->ll_lock);
+               rc = count;
+       } else {
+               atomic_long_add(nrpages, &cache->ccc_lru_left);
+       }
+       return rc;
 }
+LPROC_SEQ_FOPS(ll_max_cached_mb);
 
-static int ll_rd_checksum(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int ll_checksum_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
 
-        return snprintf(page, count, "%u\n",
-                        (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0);
+       return seq_printf(m, "%u\n", (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0);
 }
 
-static int ll_wr_checksum(struct file *file, const char *buffer,
-                          unsigned long count, void *data)
+static ssize_t ll_checksum_seq_write(struct file *file,
+                                    const char __user *buffer,
+                                    size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct seq_file *m = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
         int val, rc;
 
         if (!sbi->ll_dt_exp)
@@ -361,177 +561,479 @@ static int ll_wr_checksum(struct file *file, const char *buffer,
         else
                 sbi->ll_flags &= ~LL_SBI_CHECKSUM;
 
-        rc = obd_set_info_async(sbi->ll_dt_exp, strlen("checksum"), "checksum",
-                                sizeof(val), &val, NULL);
+        rc = obd_set_info_async(NULL, sbi->ll_dt_exp, sizeof(KEY_CHECKSUM),
+                                KEY_CHECKSUM, sizeof(val), &val, NULL);
         if (rc)
                 CWARN("Failed to set OSC checksum flags: %d\n", rc);
 
         return count;
 }
+LPROC_SEQ_FOPS(ll_checksum);
+
+static int ll_rd_track_id(struct seq_file *m, enum stats_track_type type)
+{
+       struct super_block *sb = m->private;
+
+       if (ll_s2sbi(sb)->ll_stats_track_type == type) {
+               return seq_printf(m, "%d\n",
+                                 ll_s2sbi(sb)->ll_stats_track_id);
+       } else if (ll_s2sbi(sb)->ll_stats_track_type == STATS_TRACK_ALL) {
+               return seq_printf(m, "0 (all)\n");
+       } else {
+               return seq_printf(m, "untracked\n");
+       }
+}
 
-static int ll_rd_max_rw_chunk(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int ll_wr_track_id(const char __user *buffer, unsigned long count,
+                         void *data, enum stats_track_type type)
 {
-        struct super_block *sb = data;
+       struct super_block *sb = data;
+        int rc, pid;
+
+        rc = lprocfs_write_helper(buffer, count, &pid);
+        if (rc)
+                return rc;
+        ll_s2sbi(sb)->ll_stats_track_id = pid;
+        if (pid == 0)
+                ll_s2sbi(sb)->ll_stats_track_type = STATS_TRACK_ALL;
+        else
+                ll_s2sbi(sb)->ll_stats_track_type = type;
+        lprocfs_clear_stats(ll_s2sbi(sb)->ll_stats);
+        return count;
+}
 
-        return snprintf(page, count, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk);
+static int ll_track_pid_seq_show(struct seq_file *m, void *v)
+{
+       return ll_rd_track_id(m, STATS_TRACK_PID);
 }
 
-static int ll_wr_max_rw_chunk(struct file *file, const char *buffer,
-                          unsigned long count, void *data)
+static ssize_t ll_track_pid_seq_write(struct file *file,
+                                     const char __user *buffer,
+                                     size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        int rc, val;
+       struct seq_file *seq = file->private_data;
+       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PID);
+}
+LPROC_SEQ_FOPS(ll_track_pid);
+
+static int ll_track_ppid_seq_show(struct seq_file *m, void *v)
+{
+       return ll_rd_track_id(m, STATS_TRACK_PPID);
+}
+
+static ssize_t ll_track_ppid_seq_write(struct file *file,
+                                      const char __user *buffer,
+                                      size_t count, loff_t *off)
+{
+       struct seq_file *seq = file->private_data;
+       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PPID);
+}
+LPROC_SEQ_FOPS(ll_track_ppid);
+
+static int ll_track_gid_seq_show(struct seq_file *m, void *v)
+{
+       return ll_rd_track_id(m, STATS_TRACK_GID);
+}
+
+static ssize_t ll_track_gid_seq_write(struct file *file,
+                                     const char __user *buffer,
+                                     size_t count, loff_t *off)
+{
+       struct seq_file *seq = file->private_data;
+       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_GID);
+}
+LPROC_SEQ_FOPS(ll_track_gid);
+
+static int ll_statahead_max_seq_show(struct seq_file *m, void *v)
+{
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+
+       return seq_printf(m, "%u\n", sbi->ll_sa_max);
+}
+
+static ssize_t ll_statahead_max_seq_write(struct file *file,
+                                         const char __user *buffer,
+                                         size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
+       int val, rc;
 
         rc = lprocfs_write_helper(buffer, count, &val);
         if (rc)
                 return rc;
-        ll_s2sbi(sb)->ll_max_rw_chunk = val;
+
+        if (val >= 0 && val <= LL_SA_RPC_MAX)
+                sbi->ll_sa_max = val;
+        else
+                CERROR("Bad statahead_max value %d. Valid values are in the "
+                       "range [0, %d]\n", val, LL_SA_RPC_MAX);
+
         return count;
 }
+LPROC_SEQ_FOPS(ll_statahead_max);
 
-static int ll_rd_track_id(char *page, int count, void *data, 
-                          enum stats_track_type type)
+static int ll_statahead_agl_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-
-        if (ll_s2sbi(sb)->ll_stats_track_type == type) {
-                return snprintf(page, count, "%d\n",
-                                ll_s2sbi(sb)->ll_stats_track_id);
-        
-        } else if (ll_s2sbi(sb)->ll_stats_track_type == STATS_TRACK_ALL) {
-                return snprintf(page, count, "0 (all)\n");
-        } else {
-                return snprintf(page, count, "untracked\n");
-        }
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+
+       return seq_printf(m, "%u\n",
+                         sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0);
 }
 
-static int ll_wr_track_id(const char *buffer, unsigned long count, void *data,
-                          enum stats_track_type type)
+static ssize_t ll_statahead_agl_seq_write(struct file *file,
+                                         const char __user *buffer,
+                                         size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        int rc, pid;
+       struct seq_file *m = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
+       int val, rc;
 
-        rc = lprocfs_write_helper(buffer, count, &pid);
+        rc = lprocfs_write_helper(buffer, count, &val);
         if (rc)
                 return rc;
-        ll_s2sbi(sb)->ll_stats_track_id = pid;
-        if (pid == 0)
-                ll_s2sbi(sb)->ll_stats_track_type = STATS_TRACK_ALL;
+
+        if (val)
+                sbi->ll_flags |= LL_SBI_AGL_ENABLED;
         else
-                ll_s2sbi(sb)->ll_stats_track_type = type;
-        lprocfs_clear_stats(ll_s2sbi(sb)->ll_stats);
+                sbi->ll_flags &= ~LL_SBI_AGL_ENABLED;
+
         return count;
 }
+LPROC_SEQ_FOPS(ll_statahead_agl);
 
-static int ll_rd_track_pid(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int ll_statahead_stats_seq_show(struct seq_file *m, void *v)
 {
-        return (ll_rd_track_id(page, count, data, STATS_TRACK_PID));
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+
+       return seq_printf(m,
+                        "statahead total: %u\n"
+                        "statahead wrong: %u\n"
+                        "agl total: %u\n",
+                        atomic_read(&sbi->ll_sa_total),
+                        atomic_read(&sbi->ll_sa_wrong),
+                        atomic_read(&sbi->ll_agl_total));
 }
+LPROC_SEQ_FOPS_RO(ll_statahead_stats);
 
-static int ll_wr_track_pid(struct file *file, const char *buffer,
-                          unsigned long count, void *data)
+static int ll_lazystatfs_seq_show(struct seq_file *m, void *v)
 {
-        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PID));
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+
+       return seq_printf(m, "%u\n",
+                         (sbi->ll_flags & LL_SBI_LAZYSTATFS) ? 1 : 0);
 }
 
-static int ll_rd_track_ppid(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static ssize_t ll_lazystatfs_seq_write(struct file *file,
+                                      const char __user *buffer,
+                                       size_t count, loff_t *off)
 {
-        return (ll_rd_track_id(page, count, data, STATS_TRACK_PPID));
+       struct seq_file *m = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
+       int val, rc;
+
+        rc = lprocfs_write_helper(buffer, count, &val);
+        if (rc)
+                return rc;
+
+        if (val)
+                sbi->ll_flags |= LL_SBI_LAZYSTATFS;
+        else
+                sbi->ll_flags &= ~LL_SBI_LAZYSTATFS;
+
+        return count;
 }
+LPROC_SEQ_FOPS(ll_lazystatfs);
 
-static int ll_wr_track_ppid(struct file *file, const char *buffer,
-                          unsigned long count, void *data)
+static int ll_max_easize_seq_show(struct seq_file *m, void *v)
 {
-        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PPID));
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       unsigned int ealen;
+       int rc;
+
+       rc = ll_get_max_mdsize(sbi, &ealen);
+       if (rc)
+               return rc;
+
+       return seq_printf(m, "%u\n", ealen);
 }
+LPROC_SEQ_FOPS_RO(ll_max_easize);
 
-static int ll_rd_track_gid(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+/**
+ * Get default_easize.
+ *
+ * \see client_obd::cl_default_mds_easize
+ *
+ * \param[in] m                seq_file handle
+ * \param[in] v                unused for single entry
+ *
+ * \retval 0           on success
+ * \retval negative    negated errno on failure
+ */
+static int ll_default_easize_seq_show(struct seq_file *m, void *v)
 {
-        return (ll_rd_track_id(page, count, data, STATS_TRACK_GID));
-}
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       unsigned int ealen;
+       int rc;
 
-static int ll_wr_track_gid(struct file *file, const char *buffer,
-                          unsigned long count, void *data)
-{                                                                 
-        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_GID));
+       rc = ll_get_default_mdsize(sbi, &ealen);
+       if (rc)
+               return rc;
+
+       return seq_printf(m, "%u\n", ealen);
 }
 
-static int ll_rd_contention_time(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
+/**
+ * Set default_easize.
+ *
+ * Range checking on the passed value is handled by
+ * ll_set_default_mdsize().
+ *
+ * \see client_obd::cl_default_mds_easize
+ *
+ * \param[in] file     proc file
+ * \param[in] buffer   string passed from user space
+ * \param[in] count    \a buffer length
+ * \param[in] off      unused for single entry
+ *
+ * \retval positive    \a count on success
+ * \retval negative    negated errno on failure
+ */
+static ssize_t ll_default_easize_seq_write(struct file *file,
+                                          const char __user *buffer,
+                                          size_t count, loff_t *unused)
 {
-        struct super_block *sb = data;
+       struct seq_file         *seq = file->private_data;
+       struct super_block      *sb = (struct super_block *)seq->private;
+       struct ll_sb_info       *sbi = ll_s2sbi(sb);
+       int                      val;
+       int                      rc;
+
+       if (count == 0)
+               return 0;
+
+       rc = lprocfs_write_helper(buffer, count, &val);
+       if (rc < 0)
+               return rc;
 
-        *eof = 1;
-        return snprintf(page, count, "%u\n", ll_s2sbi(sb)->ll_contention_time);
+       rc = ll_set_default_mdsize(sbi, val);
+       if (rc)
+               return rc;
 
+       return count;
+}
+LPROC_SEQ_FOPS(ll_default_easize);
+
+static int ll_sbi_flags_seq_show(struct seq_file *m, void *v)
+{
+       const char *str[] = LL_SBI_FLAGS;
+       struct super_block *sb = m->private;
+       int flags = ll_s2sbi(sb)->ll_flags;
+       int i = 0;
+
+       while (flags != 0) {
+               if (ARRAY_SIZE(str) <= i) {
+                       CERROR("%s: Revise array LL_SBI_FLAGS to match sbi "
+                               "flags please.\n", ll_get_fsname(sb, NULL, 0));
+                       return -EINVAL;
+               }
+
+               if (flags & 0x1)
+                       seq_printf(m, "%s ", str[i]);
+               flags >>= 1;
+               ++i;
+       }
+       seq_printf(m, "\b\n");
+       return 0;
 }
+LPROC_SEQ_FOPS_RO(ll_sbi_flags);
 
-static int ll_wr_contention_time(struct file *file, const char *buffer,
-                                 unsigned long count, void *data)
+static int ll_unstable_stats_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct super_block      *sb    = m->private;
+       struct ll_sb_info       *sbi   = ll_s2sbi(sb);
+       struct cl_client_cache  *cache = sbi->ll_cache;
+       long pages;
+       int mb;
+
+       pages = atomic_long_read(&cache->ccc_unstable_nr);
+       mb    = (pages * PAGE_CACHE_SIZE) >> 20;
+
+       return seq_printf(m, "unstable_check:     %8d\n"
+                            "unstable_pages: %12ld\n"
+                            "unstable_mb:        %8d\n",
+                         cache->ccc_unstable_check, pages, mb);
+}
 
-        return lprocfs_write_helper(buffer, count,&sbi->ll_contention_time) ?:
-                count;
+static ssize_t ll_unstable_stats_seq_write(struct file *file,
+                                          const char __user *buffer,
+                                          size_t count, loff_t *unused)
+{
+       struct seq_file *seq = file->private_data;
+       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)seq->private);
+       char kernbuf[128];
+       int val, rc;
+
+       if (count == 0)
+               return 0;
+       if (count >= sizeof(kernbuf))
+               return -EINVAL;
+
+       if (copy_from_user(kernbuf, buffer, count))
+               return -EFAULT;
+       kernbuf[count] = 0;
+
+       buffer += lprocfs_find_named_value(kernbuf, "unstable_check:", &count) -
+                 kernbuf;
+       rc = lprocfs_write_helper(buffer, count, &val);
+       if (rc < 0)
+               return rc;
+
+       /* borrow lru lock to set the value */
+       spin_lock(&sbi->ll_cache->ccc_lru_lock);
+       sbi->ll_cache->ccc_unstable_check = !!val;
+       spin_unlock(&sbi->ll_cache->ccc_lru_lock);
+
+       return count;
 }
+LPROC_SEQ_FOPS(ll_unstable_stats);
 
-static int ll_rd_lockless_truncate(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data)
+static int ll_root_squash_seq_show(struct seq_file *m, void *v)
 {
-        struct super_block *sb = data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct root_squash_info *squash = &sbi->ll_squash;
 
-        *eof = 1;
-        return snprintf(page, count, "%u\n",
-                        ll_s2sbi(sb)->ll_lockless_truncate_enable);
+       return seq_printf(m, "%u:%u\n", squash->rsi_uid, squash->rsi_gid);
 }
 
-static int ll_wr_lockless_truncate(struct file *file, const char *buffer,
-                                   unsigned long count, void *data)
+static ssize_t ll_root_squash_seq_write(struct file *file,
+                                       const char __user *buffer,
+                                       size_t count, loff_t *off)
 {
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct root_squash_info *squash = &sbi->ll_squash;
+
+       return lprocfs_wr_root_squash(buffer, count, squash,
+                                     ll_get_fsname(sb, NULL, 0));
+}
+LPROC_SEQ_FOPS(ll_root_squash);
 
-        return lprocfs_write_helper(buffer, count,
-                                    &sbi->ll_lockless_truncate_enable)
-                                    ?: count;
+static int ll_nosquash_nids_seq_show(struct seq_file *m, void *v)
+{
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct root_squash_info *squash = &sbi->ll_squash;
+       int len, rc;
+
+       down_read(&squash->rsi_sem);
+       if (!list_empty(&squash->rsi_nosquash_nids)) {
+               len = cfs_print_nidlist(m->buf + m->count, m->size - m->count,
+                                       &squash->rsi_nosquash_nids);
+               m->count += len;
+               rc = seq_printf(m, "\n");
+       } else {
+               rc = seq_printf(m, "NONE\n");
+       }
+       up_read(&squash->rsi_sem);
+
+       return rc;
 }
 
-static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
-        { "uuid",         ll_rd_sb_uuid,          0, 0 },
-        //{ "mntpt_path",   ll_rd_path,             0, 0 },
-        { "fstype",       ll_rd_fstype,           0, 0 },
-        { "blocksize",    ll_rd_blksize,          0, 0 },
-        { "kbytestotal",  ll_rd_kbytestotal,      0, 0 },
-        { "kbytesfree",   ll_rd_kbytesfree,       0, 0 },
-        { "kbytesavail",  ll_rd_kbytesavail,      0, 0 },
-        { "filestotal",   ll_rd_filestotal,       0, 0 },
-        { "filesfree",    ll_rd_filesfree,        0, 0 },
-        { "client_type",  ll_rd_client_type,      0, 0 },
-        //{ "filegroups",   lprocfs_rd_filegroups,  0, 0 },
-        { "max_read_ahead_mb", ll_rd_max_readahead_mb,
-                               ll_wr_max_readahead_mb, 0 },
-        { "max_read_ahead_whole_mb", ll_rd_max_read_ahead_whole_mb,
-                                     ll_wr_max_read_ahead_whole_mb, 0 },
-        { "max_cached_mb",    ll_rd_max_cached_mb, ll_wr_max_cached_mb, 0 },
-        { "checksum_pages",   ll_rd_checksum, ll_wr_checksum, 0 },
-        { "max_rw_chunk",     ll_rd_max_rw_chunk, ll_wr_max_rw_chunk, 0 },
-        { "stats_track_pid",  ll_rd_track_pid, ll_wr_track_pid, 0 },
-        { "stats_track_ppid", ll_rd_track_ppid, ll_wr_track_ppid, 0 },
-        { "stats_track_gid",  ll_rd_track_gid, ll_wr_track_gid, 0 },
-        { "contention_seconds", ll_rd_contention_time, ll_wr_contention_time, 0},
-        { "lockless_truncate", ll_rd_lockless_truncate,
-                               ll_wr_lockless_truncate, 0},
-        { 0 }
+static ssize_t ll_nosquash_nids_seq_write(struct file *file,
+                                         const char __user *buffer,
+                                         size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct root_squash_info *squash = &sbi->ll_squash;
+       int rc;
+
+       rc = lprocfs_wr_nosquash_nids(buffer, count, squash,
+                                     ll_get_fsname(sb, NULL, 0));
+       if (rc < 0)
+               return rc;
+
+       ll_compute_rootsquash_state(sbi);
+
+       return rc;
+}
+LPROC_SEQ_FOPS(ll_nosquash_nids);
+
+struct lprocfs_vars lprocfs_llite_obd_vars[] = {
+       { .name =       "uuid",
+         .fops =       &ll_sb_uuid_fops                        },
+       { .name =       "fstype",
+         .fops =       &ll_fstype_fops                         },
+       { .name =       "site",
+         .fops =       &ll_site_stats_fops                     },
+       { .name =       "blocksize",
+         .fops =       &ll_blksize_fops                        },
+       { .name =       "kbytestotal",
+         .fops =       &ll_kbytestotal_fops                    },
+       { .name =       "kbytesfree",
+         .fops =       &ll_kbytesfree_fops                     },
+       { .name =       "kbytesavail",
+         .fops =       &ll_kbytesavail_fops                    },
+       { .name =       "filestotal",
+         .fops =       &ll_filestotal_fops                     },
+       { .name =       "filesfree",
+         .fops =       &ll_filesfree_fops                      },
+       { .name =       "client_type",
+         .fops =       &ll_client_type_fops                    },
+       { .name =       "max_read_ahead_mb",
+         .fops =       &ll_max_readahead_mb_fops               },
+       { .name =       "max_read_ahead_per_file_mb",
+         .fops =       &ll_max_readahead_per_file_mb_fops      },
+       { .name =       "max_read_ahead_whole_mb",
+         .fops =       &ll_max_read_ahead_whole_mb_fops        },
+       { .name =       "max_cached_mb",
+         .fops =       &ll_max_cached_mb_fops                  },
+       { .name =       "checksum_pages",
+         .fops =       &ll_checksum_fops                       },
+       { .name =       "stats_track_pid",
+         .fops =       &ll_track_pid_fops                      },
+       { .name =       "stats_track_ppid",
+         .fops =       &ll_track_ppid_fops                     },
+       { .name =       "stats_track_gid",
+         .fops =       &ll_track_gid_fops                      },
+       { .name =       "statahead_max",
+         .fops =       &ll_statahead_max_fops                  },
+       { .name =       "statahead_agl",
+         .fops =       &ll_statahead_agl_fops                  },
+       { .name =       "statahead_stats",
+         .fops =       &ll_statahead_stats_fops                },
+       { .name =       "lazystatfs",
+         .fops =       &ll_lazystatfs_fops                     },
+       { .name =       "max_easize",
+         .fops =       &ll_max_easize_fops                     },
+       { .name =       "default_easize",
+         .fops =       &ll_default_easize_fops                 },
+       { .name =       "sbi_flags",
+         .fops =       &ll_sbi_flags_fops                      },
+       { .name =       "xattr_cache",
+         .fops =       &ll_xattr_cache_fops                    },
+       { .name =       "unstable_stats",
+         .fops =       &ll_unstable_stats_fops                 },
+       { .name =       "root_squash",
+         .fops =       &ll_root_squash_fops                    },
+       { .name =       "nosquash_nids",
+         .fops =       &ll_nosquash_nids_fops                  },
+       { NULL }
 };
 
 #define MAX_STRING_SIZE 128
 
-struct llite_file_opcode {
+static const struct llite_file_opcode {
         __u32       opcode;
         __u32       type;
         const char *opname;
@@ -539,14 +1041,6 @@ struct llite_file_opcode {
         /* file operation */
         { LPROC_LL_DIRTY_HITS,     LPROCFS_TYPE_REGS, "dirty_pages_hits" },
         { LPROC_LL_DIRTY_MISSES,   LPROCFS_TYPE_REGS, "dirty_pages_misses" },
-        { LPROC_LL_WB_WRITEPAGE,   LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "writeback_from_writepage" },
-        { LPROC_LL_WB_PRESSURE,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "writeback_from_pressure" },
-        { LPROC_LL_WB_OK,          LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "writeback_ok_pages" },
-        { LPROC_LL_WB_FAIL,        LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "writeback_failed_pages" },
         { LPROC_LL_READ_BYTES,     LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
                                    "read_bytes" },
         { LPROC_LL_WRITE_BYTES,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
@@ -555,36 +1049,40 @@ struct llite_file_opcode {
                                    "brw_read" },
         { LPROC_LL_BRW_WRITE,      LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
                                    "brw_write" },
-
+        { LPROC_LL_OSC_READ,       LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
+                                   "osc_read" },
+        { LPROC_LL_OSC_WRITE,      LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
+                                   "osc_write" },
         { LPROC_LL_IOCTL,          LPROCFS_TYPE_REGS, "ioctl" },
         { LPROC_LL_OPEN,           LPROCFS_TYPE_REGS, "open" },
         { LPROC_LL_RELEASE,        LPROCFS_TYPE_REGS, "close" },
         { LPROC_LL_MAP,            LPROCFS_TYPE_REGS, "mmap" },
         { LPROC_LL_LLSEEK,         LPROCFS_TYPE_REGS, "seek" },
         { LPROC_LL_FSYNC,          LPROCFS_TYPE_REGS, "fsync" },
+        { LPROC_LL_READDIR,        LPROCFS_TYPE_REGS, "readdir" },
         /* inode operation */
         { LPROC_LL_SETATTR,        LPROCFS_TYPE_REGS, "setattr" },
         { LPROC_LL_TRUNC,          LPROCFS_TYPE_REGS, "truncate" },
-        { LPROC_LL_LOCKLESS_TRUNC, LPROCFS_TYPE_REGS, "lockless_truncate"},
         { LPROC_LL_FLOCK,          LPROCFS_TYPE_REGS, "flock" },
         { LPROC_LL_GETATTR,        LPROCFS_TYPE_REGS, "getattr" },
+        /* dir inode operation */
+        { LPROC_LL_CREATE,         LPROCFS_TYPE_REGS, "create" },
+        { LPROC_LL_LINK,           LPROCFS_TYPE_REGS, "link" },
+        { LPROC_LL_UNLINK,         LPROCFS_TYPE_REGS, "unlink" },
+        { LPROC_LL_SYMLINK,        LPROCFS_TYPE_REGS, "symlink" },
+        { LPROC_LL_MKDIR,          LPROCFS_TYPE_REGS, "mkdir" },
+        { LPROC_LL_RMDIR,          LPROCFS_TYPE_REGS, "rmdir" },
+        { LPROC_LL_MKNOD,          LPROCFS_TYPE_REGS, "mknod" },
+        { LPROC_LL_RENAME,         LPROCFS_TYPE_REGS, "rename" },
         /* special inode operation */
         { LPROC_LL_STAFS,          LPROCFS_TYPE_REGS, "statfs" },
         { LPROC_LL_ALLOC_INODE,    LPROCFS_TYPE_REGS, "alloc_inode" },
         { LPROC_LL_SETXATTR,       LPROCFS_TYPE_REGS, "setxattr" },
         { LPROC_LL_GETXATTR,       LPROCFS_TYPE_REGS, "getxattr" },
+       { LPROC_LL_GETXATTR_HITS,  LPROCFS_TYPE_REGS, "getxattr_hits" },
         { LPROC_LL_LISTXATTR,      LPROCFS_TYPE_REGS, "listxattr" },
         { LPROC_LL_REMOVEXATTR,    LPROCFS_TYPE_REGS, "removexattr" },
         { LPROC_LL_INODE_PERM,     LPROCFS_TYPE_REGS, "inode_permission" },
-        { LPROC_LL_DIRECT_READ,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "direct_read" },
-        { LPROC_LL_DIRECT_WRITE,   LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
-                                   "direct_write" },
-        { LPROC_LL_LOCKLESS_READ,  LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
-                                   "lockless_read_bytes" },
-        { LPROC_LL_LOCKLESS_WRITE, LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
-                                   "lockless_write_bytes" },
-
 };
 
 void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)
@@ -597,86 +1095,95 @@ void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)
                  sbi->ll_stats_track_id == current->pid)
                 lprocfs_counter_add(sbi->ll_stats, op, count);
         else if (sbi->ll_stats_track_type == STATS_TRACK_PPID &&
-                 sbi->ll_stats_track_id == current->p_pptr->pid)
-                lprocfs_counter_add(sbi->ll_stats, op, count);
-        else if (sbi->ll_stats_track_type == STATS_TRACK_GID &&
-                 sbi->ll_stats_track_id == current->gid)
+                 sbi->ll_stats_track_id == current->parent->pid)
                 lprocfs_counter_add(sbi->ll_stats, op, count);
+       else if (sbi->ll_stats_track_type == STATS_TRACK_GID &&
+                sbi->ll_stats_track_id ==
+                       from_kgid(&init_user_ns, current_gid()))
+               lprocfs_counter_add(sbi->ll_stats, op, count);
 }
 EXPORT_SYMBOL(ll_stats_ops_tally);
 
+static const char *ra_stat_string[] = {
+       [RA_STAT_HIT] = "hits",
+       [RA_STAT_MISS] = "misses",
+       [RA_STAT_DISTANT_READPAGE] = "readpage not consecutive",
+       [RA_STAT_MISS_IN_WINDOW] = "miss inside window",
+       [RA_STAT_FAILED_GRAB_PAGE] = "failed grab_cache_page",
+       [RA_STAT_FAILED_MATCH] = "failed lock match",
+       [RA_STAT_DISCARDED] = "read but discarded",
+       [RA_STAT_ZERO_LEN] = "zero length file",
+       [RA_STAT_ZERO_WINDOW] = "zero size window",
+       [RA_STAT_EOF] = "read-ahead to EOF",
+       [RA_STAT_MAX_IN_FLIGHT] = "hit max r-a issue",
+       [RA_STAT_WRONG_GRAB_PAGE] = "wrong page from grab_cache_page",
+       [RA_STAT_FAILED_REACH_END] = "failed to reach end"
+};
+
+LPROC_SEQ_FOPS_RO_TYPE(llite, name);
+LPROC_SEQ_FOPS_RO_TYPE(llite, uuid);
+
 int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
                                 struct super_block *sb, char *osc, char *mdc)
 {
-        struct lprocfs_vars lvars[2];
-        struct lustre_sb_info *lsi = s2lsi(sb);
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        struct obd_device *obd;
-        char name[MAX_STRING_SIZE + 1], *ptr;
-        int err, id, len;
-        struct proc_dir_entry *entry;
-        ENTRY;
-
-        memset(lvars, 0, sizeof(lvars));
-
-        name[MAX_STRING_SIZE] = '\0';
-        lvars[0].name = name;
-
-        LASSERT(sbi != NULL);
-        LASSERT(mdc != NULL);
-        LASSERT(osc != NULL);
-
-        /* Get fsname */
-        len = strlen(lsi->lsi_lmd->lmd_profile);
-        ptr = strrchr(lsi->lsi_lmd->lmd_profile, '-');
-        if (ptr && (strcmp(ptr, "-client") == 0))
-                len -= 7; 
-        
-        /* Mount info */
-        snprintf(name, MAX_STRING_SIZE, "%.*s-%p", len,
-                 lsi->lsi_lmd->lmd_profile, sb);
-        
-        sbi->ll_proc_root = lprocfs_register(name, parent, NULL, NULL);
-        if (IS_ERR(sbi->ll_proc_root)) {
-                err = PTR_ERR(sbi->ll_proc_root);
-                sbi->ll_proc_root = NULL;
-                RETURN(err);
-        }
+       struct lprocfs_vars lvars[2];
+       struct lustre_sb_info *lsi = s2lsi(sb);
+       struct ll_sb_info *sbi = ll_s2sbi(sb);
+       struct obd_device *obd;
+       struct proc_dir_entry *dir;
+       char name[MAX_STRING_SIZE + 1], *ptr;
+       int err, id, len, rc;
+       ENTRY;
+
+       memset(lvars, 0, sizeof(lvars));
+
+       name[MAX_STRING_SIZE] = '\0';
+       lvars[0].name = name;
+
+       LASSERT(sbi != NULL);
+       LASSERT(mdc != NULL);
+       LASSERT(osc != NULL);
+
+       /* Get fsname */
+       len = strlen(lsi->lsi_lmd->lmd_profile);
+       ptr = strrchr(lsi->lsi_lmd->lmd_profile, '-');
+       if (ptr && (strcmp(ptr, "-client") == 0))
+               len -= 7;
+
+       /* Mount info */
+       snprintf(name, MAX_STRING_SIZE, "%.*s-%p", len,
+                lsi->lsi_lmd->lmd_profile, sb);
+
+       sbi->ll_proc_root = lprocfs_register(name, parent, NULL, NULL);
+       if (IS_ERR(sbi->ll_proc_root)) {
+               err = PTR_ERR(sbi->ll_proc_root);
+               sbi->ll_proc_root = NULL;
+               RETURN(err);
+       }
+
+       rc = lprocfs_seq_create(sbi->ll_proc_root, "dump_page_cache", 0444,
+                               &vvp_dump_pgcache_file_ops, sbi);
+       if (rc)
+               CWARN("Error adding the dump_page_cache file\n");
+
+        rc = lprocfs_seq_create(sbi->ll_proc_root, "extents_stats", 0644,
+                                &ll_rw_extents_stats_fops, sbi);
+        if (rc)
+                CWARN("Error adding the extent_stats file\n");
 
-        entry = create_proc_entry("dump_page_cache", 0444, sbi->ll_proc_root);
-        if (entry == NULL)
-                GOTO(out, err = -ENOMEM);
-        entry->proc_fops = &llite_dump_pgcache_fops;
-        entry->data = sbi;
+        rc = lprocfs_seq_create(sbi->ll_proc_root, "extents_stats_per_process",
+                                0644, &ll_rw_extents_stats_pp_fops, sbi);
+        if (rc)
+                CWARN("Error adding the extents_stats_per_process file\n");
 
-        entry = create_proc_entry("read_ahead_stats", 0644, sbi->ll_proc_root);
-        if (entry == NULL)
-                GOTO(out, err = -ENOMEM);
-        entry->proc_fops = &ll_ra_stats_fops;
-        entry->data = sbi;
-
-        entry = create_proc_entry("extents_stats", 0644, sbi->ll_proc_root);
-        if (entry == NULL)
-                 GOTO(out, err = -ENOMEM);
-        entry->proc_fops = &ll_rw_extents_stats_fops;
-        entry->data = sbi;
-
-        entry = create_proc_entry("extents_stats_per_process", 0644,
-                                  sbi->ll_proc_root);
-        if (entry == NULL)
-                 GOTO(out, err = -ENOMEM);
-        entry->proc_fops = &ll_rw_extents_stats_pp_fops;
-        entry->data = sbi;
-
-        entry = create_proc_entry("offset_stats", 0644, sbi->ll_proc_root);
-        if (entry == NULL)
-                GOTO(out, err = -ENOMEM);
-        entry->proc_fops = &ll_rw_offset_stats_fops;
-        entry->data = sbi;
+        rc = lprocfs_seq_create(sbi->ll_proc_root, "offset_stats", 0644,
+                                &ll_rw_offset_stats_fops, sbi);
+        if (rc)
+                CWARN("Error adding the offset_stats file\n");
 
         /* File operations stats */
-        sbi->ll_stats = lprocfs_alloc_stats(LPROC_LL_FILE_OPCODES, 
-                                            LPROCFS_STATS_FLAG_PERCPU);
+        sbi->ll_stats = lprocfs_alloc_stats(LPROC_LL_FILE_OPCODES,
+                                            LPROCFS_STATS_FLAG_NONE);
         if (sbi->ll_stats == NULL)
                 GOTO(out, err = -ENOMEM);
         /* do counter init */
@@ -698,306 +1205,86 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
         if (err)
                 GOTO(out, err);
 
-        err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb);
+        sbi->ll_ra_stats = lprocfs_alloc_stats(ARRAY_SIZE(ra_stat_string),
+                                               LPROCFS_STATS_FLAG_NONE);
+        if (sbi->ll_ra_stats == NULL)
+                GOTO(out, err = -ENOMEM);
+
+        for (id = 0; id < ARRAY_SIZE(ra_stat_string); id++)
+                lprocfs_counter_init(sbi->ll_ra_stats, id, 0,
+                                     ra_stat_string[id], "pages");
+        err = lprocfs_register_stats(sbi->ll_proc_root, "read_ahead_stats",
+                                     sbi->ll_ra_stats);
         if (err)
                 GOTO(out, err);
 
-        /* MDC info */
-        obd = class_name2obd(mdc);
 
-        LASSERT(obd != NULL);
-        LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
-        LASSERT(obd->obd_type->typ_name != NULL);
+       err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb);
+       if (err)
+               GOTO(out, err);
 
-        snprintf(name, MAX_STRING_SIZE, "%s/common_name",
-                 obd->obd_type->typ_name);
-        lvars[0].read_fptr = lprocfs_rd_name;
-        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
-        if (err)
-                GOTO(out, err);
+       /* MDC info */
+       obd = class_name2obd(mdc);
 
-        snprintf(name, MAX_STRING_SIZE, "%s/uuid", obd->obd_type->typ_name);
-        lvars[0].read_fptr = lprocfs_rd_uuid;
-        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
-        if (err)
-                GOTO(out, err);
+       LASSERT(obd != NULL);
+       LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+       LASSERT(obd->obd_type->typ_name != NULL);
 
-        /* OSC */
-        obd = class_name2obd(osc);
+       dir = proc_mkdir(obd->obd_type->typ_name, sbi->ll_proc_root);
+       if (dir == NULL)
+               GOTO(out, err = -ENOMEM);
 
-        LASSERT(obd != NULL);
-        LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
-        LASSERT(obd->obd_type->typ_name != NULL);
+       snprintf(name, MAX_STRING_SIZE, "common_name");
+       lvars[0].fops = &llite_name_fops;
+       err = lprocfs_add_vars(dir, lvars, obd);
+       if (err)
+               GOTO(out, err);
 
-        snprintf(name, MAX_STRING_SIZE, "%s/common_name",
-                 obd->obd_type->typ_name);
-        lvars[0].read_fptr = lprocfs_rd_name;
-        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
-        if (err)
-                GOTO(out, err);
+       snprintf(name, MAX_STRING_SIZE, "uuid");
+       lvars[0].fops = &llite_uuid_fops;
+       err = lprocfs_add_vars(dir, lvars, obd);
+       if (err)
+               GOTO(out, err);
+
+       /* OSC */
+       obd = class_name2obd(osc);
 
-        snprintf(name, MAX_STRING_SIZE, "%s/uuid", obd->obd_type->typ_name);
-        lvars[0].read_fptr = lprocfs_rd_uuid;
-        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
+       LASSERT(obd != NULL);
+       LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+       LASSERT(obd->obd_type->typ_name != NULL);
+
+       dir = proc_mkdir(obd->obd_type->typ_name, sbi->ll_proc_root);
+       if (dir == NULL)
+               GOTO(out, err = -ENOMEM);
+
+       snprintf(name, MAX_STRING_SIZE, "common_name");
+       lvars[0].fops = &llite_name_fops;
+       err = lprocfs_add_vars(dir, lvars, obd);
+       if (err)
+               GOTO(out, err);
+
+       snprintf(name, MAX_STRING_SIZE, "uuid");
+       lvars[0].fops = &llite_uuid_fops;
+       err = lprocfs_add_vars(dir, lvars, obd);
 out:
-        if (err) {
-                lprocfs_remove(&sbi->ll_proc_root);
-                lprocfs_free_stats(&sbi->ll_stats);
-        }
-        RETURN(err);
+       if (err) {
+               lprocfs_remove(&sbi->ll_proc_root);
+               lprocfs_free_stats(&sbi->ll_ra_stats);
+               lprocfs_free_stats(&sbi->ll_stats);
+       }
+       RETURN(err);
 }
 
 void lprocfs_unregister_mountpoint(struct ll_sb_info *sbi)
 {
         if (sbi->ll_proc_root) {
                 lprocfs_remove(&sbi->ll_proc_root);
+                lprocfs_free_stats(&sbi->ll_ra_stats);
                 lprocfs_free_stats(&sbi->ll_stats);
         }
 }
 #undef MAX_STRING_SIZE
 
-#define seq_page_flag(seq, page, flag, has_flags) do {                  \
-                if (test_bit(PG_##flag, &(page)->flags)) {              \
-                        if (!has_flags)                                 \
-                                has_flags = 1;                          \
-                        else                                            \
-                                seq_putc(seq, '|');                     \
-                        seq_puts(seq, #flag);                           \
-                }                                                       \
-        } while(0);
-
-static void *llite_dump_pgcache_seq_start(struct seq_file *seq, loff_t *pos)
-{
-        struct ll_async_page *dummy_llap = seq->private;
-
-        if (dummy_llap->llap_magic == 2)
-                return NULL;
-
-        return (void *)1;
-}
-
-static int llite_dump_pgcache_seq_show(struct seq_file *seq, void *v)
-{
-        struct ll_async_page *llap, *dummy_llap = seq->private;
-        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
-
-        /* 2.4 doesn't seem to have SEQ_START_TOKEN, so we implement
-         * it in our own state */
-        if (dummy_llap->llap_magic == 0) {
-                seq_printf(seq, "gener |  llap  cookie  origin wq du wb | page "
-                                "inode index count [ page flags ]\n");
-                return 0;
-        }
-
-        spin_lock(&sbi->ll_lock);
-
-        llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_pglist_item);
-        if (llap != NULL)  {
-                int has_flags = 0;
-                struct page *page = llap->llap_page;
-
-                LASSERTF(llap->llap_origin < LLAP__ORIGIN_MAX, "%u\n",
-                         llap->llap_origin);
-
-                seq_printf(seq," %5lu | %p %p %s %s %s %s | %p %lu/%u(%p) "
-                           "%lu %u [",
-                           sbi->ll_pglist_gen,
-                           llap, llap->llap_cookie,
-                           llap_origins[llap->llap_origin],
-                           llap->llap_write_queued ? "wq" : "- ",
-                           llap->llap_defer_uptodate ? "du" : "- ",
-                           PageWriteback(page) ? "wb" : "-",
-                           page, page->mapping->host->i_ino,
-                           page->mapping->host->i_generation,
-                           page->mapping->host, page->index,
-                           page_count(page));
-                seq_page_flag(seq, page, locked, has_flags);
-                seq_page_flag(seq, page, error, has_flags);
-                seq_page_flag(seq, page, referenced, has_flags);
-                seq_page_flag(seq, page, uptodate, has_flags);
-                seq_page_flag(seq, page, dirty, has_flags);
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12))
-                seq_page_flag(seq, page, highmem, has_flags);
-#endif
-                seq_page_flag(seq, page, writeback, has_flags);
-                if (!has_flags)
-                        seq_puts(seq, "-]\n");
-                else
-                        seq_puts(seq, "]\n");
-        }
-
-        spin_unlock(&sbi->ll_lock);
-
-        return 0;
-}
-
-static void *llite_dump_pgcache_seq_next(struct seq_file *seq, void *v, 
-                                         loff_t *pos)
-{
-        struct ll_async_page *llap, *dummy_llap = seq->private;
-        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
-
-        /* bail if we just displayed the banner */
-        if (dummy_llap->llap_magic == 0) {
-                dummy_llap->llap_magic = 1;
-                return dummy_llap;
-        }
-
-        /* we've just displayed the llap that is after us in the list.
-         * we advance to a position beyond it, returning null if there
-         * isn't another llap in the list beyond that new position. */
-        spin_lock(&sbi->ll_lock);
-        llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_pglist_item);
-        list_del_init(&dummy_llap->llap_pglist_item);
-        if (llap) {
-                list_add(&dummy_llap->llap_pglist_item,&llap->llap_pglist_item);
-                llap =llite_pglist_next_llap(sbi,&dummy_llap->llap_pglist_item);
-        }
-        spin_unlock(&sbi->ll_lock);
-
-        ++*pos;
-        if (llap == NULL) {
-                dummy_llap->llap_magic = 2;
-                return NULL;
-        }
-        return dummy_llap;
-}
-
-static void null_stop(struct seq_file *seq, void *v)
-{
-}
-
-struct seq_operations llite_dump_pgcache_seq_sops = {
-        .start = llite_dump_pgcache_seq_start,
-        .stop = null_stop,
-        .next = llite_dump_pgcache_seq_next,
-        .show = llite_dump_pgcache_seq_show,
-};
-
-/* we're displaying llaps in a list_head list.  we don't want to hold a lock
- * while we walk the entire list, and we don't want to have to seek into
- * the right position in the list as an app advances with many syscalls.  we
- * allocate a dummy llap and hang it off file->private.  its position in
- * the list records where the app is currently displaying.  this way our
- * seq .start and .stop don't actually do anything.  .next returns null
- * when the dummy hits the end of the list which eventually leads to .release
- * where we tear down.  this kind of displaying is super-racey, so we put
- * a generation counter on the list so the output shows when the list
- * changes between reads.
- */
-static int llite_dump_pgcache_seq_open(struct inode *inode, struct file *file)
-{
-        struct proc_dir_entry *dp = PDE(inode);
-        struct ll_async_page *dummy_llap;
-        struct seq_file *seq;
-        struct ll_sb_info *sbi = dp->data;
-        int rc = -ENOMEM;
-
-        LPROCFS_ENTRY_AND_CHECK(dp);
-
-        OBD_ALLOC_PTR_WAIT(dummy_llap);
-        if (dummy_llap == NULL)
-                GOTO(out, rc);
-        dummy_llap->llap_page = NULL;
-        dummy_llap->llap_cookie = sbi;
-        dummy_llap->llap_magic = 0;
-
-        rc = seq_open(file, &llite_dump_pgcache_seq_sops);
-        if (rc) {
-                OBD_FREE(dummy_llap, sizeof(*dummy_llap));
-                GOTO(out, rc);
-        }
-        seq = file->private_data;
-        seq->private = dummy_llap;
-
-        spin_lock(&sbi->ll_lock);
-        list_add(&dummy_llap->llap_pglist_item, &sbi->ll_pglist);
-        spin_unlock(&sbi->ll_lock);
-
-out:
-        if (rc)
-                LPROCFS_EXIT();
-        return rc;
-}
-
-static int llite_dump_pgcache_seq_release(struct inode *inode,
-                                          struct file *file)
-{
-        struct seq_file *seq = file->private_data;
-        struct ll_async_page *dummy_llap = seq->private;
-        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
-
-        spin_lock(&sbi->ll_lock);
-        if (!list_empty(&dummy_llap->llap_pglist_item))
-                list_del_init(&dummy_llap->llap_pglist_item);
-        spin_unlock(&sbi->ll_lock);
-        OBD_FREE(dummy_llap, sizeof(*dummy_llap));
-
-        return lprocfs_seq_release(inode, file);
-}
-
-struct file_operations llite_dump_pgcache_fops = {
-        .owner   = THIS_MODULE,
-        .open    = llite_dump_pgcache_seq_open,
-        .read    = seq_read,
-        .release = llite_dump_pgcache_seq_release,
-};
-
-static int ll_ra_stats_seq_show(struct seq_file *seq, void *v)
-{
-        struct timeval now;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_ra_info *ra = &sbi->ll_ra_info;
-        int i;
-        static char *ra_stat_strings[] = {
-                [RA_STAT_HIT] = "hits",
-                [RA_STAT_MISS] = "misses",
-                [RA_STAT_DISTANT_READPAGE] = "readpage not consecutive",
-                [RA_STAT_MISS_IN_WINDOW] = "miss inside window",
-                [RA_STAT_FAILED_GRAB_PAGE] = "failed grab_cache_page",
-                [RA_STAT_FAILED_MATCH] = "failed lock match",
-                [RA_STAT_DISCARDED] = "read but discarded",
-                [RA_STAT_ZERO_LEN] = "zero length file",
-                [RA_STAT_ZERO_WINDOW] = "zero size window",
-                [RA_STAT_EOF] = "read-ahead to EOF",
-                [RA_STAT_MAX_IN_FLIGHT] = "hit max r-a issue",
-                [RA_STAT_WRONG_GRAB_PAGE] = "wrong page from grab_cache_page",
-        };
-
-        do_gettimeofday(&now);
-
-        spin_lock(&sbi->ll_lock);
-
-        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-                   now.tv_sec, now.tv_usec);
-        seq_printf(seq, "pending issued pages:           %lu\n",
-                   ra->ra_cur_pages);
-
-        for(i = 0; i < _NR_RA_STAT; i++)
-                seq_printf(seq, "%-25s %lu\n", ra_stat_strings[i], 
-                           ra->ra_stats[i]);
-
-        spin_unlock(&sbi->ll_lock);
-
-        return 0;
-}
-
-static ssize_t ll_ra_stats_seq_write(struct file *file, const char *buf,
-                                       size_t len, loff_t *off)
-{
-        struct seq_file *seq = file->private_data;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_ra_info *ra = &sbi->ll_ra_info;
-
-        spin_lock(&sbi->ll_lock);
-        memset(ra->ra_stats, 0, sizeof(ra->ra_stats));
-        spin_unlock(&sbi->ll_lock);
-
-        return len;
-}
-
-LPROC_SEQ_FOPS(ll_ra_stats);
-
 #define pct(a,b) (b ? a * 100 / b : 0)
 
 static void ll_display_extents_info(struct ll_rw_extents_info *io_extents,
@@ -1045,107 +1332,158 @@ static int ll_rw_extents_stats_pp_seq_show(struct seq_file *seq, void *v)
         struct timeval now;
         struct ll_sb_info *sbi = seq->private;
         struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
-        int k;
+       int k;
 
-        do_gettimeofday(&now);
+       do_gettimeofday(&now);
 
-        if (!sbi->ll_rw_stats_on) {
-                seq_printf(seq, "Disabled\n"
-                                "Write anything in this file to activate\n");
+       if (!sbi->ll_rw_stats_on) {
+               seq_printf(seq, "disabled\n"
+                                "write anything in this file to activate, "
+                                "then 0 or \"[D/d]isabled\" to deactivate\n");
                 return 0;
         }
         seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
                    now.tv_sec, now.tv_usec);
         seq_printf(seq, "%15s %19s       | %20s\n", " ", "read", "write");
-        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n", 
+        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n",
                    "extents", "calls", "%", "cum%",
                    "calls", "%", "cum%");
-        spin_lock(&sbi->ll_pp_extent_lock);
-        for(k = 0; k < LL_PROCESS_HIST_MAX; k++) {
-                if(io_extents->pp_extents[k].pid != 0) {
-                        seq_printf(seq, "\nPID: %d\n",
-                                   io_extents->pp_extents[k].pid);
-                        ll_display_extents_info(io_extents, seq, k);
-                }
-        }
-        spin_unlock(&sbi->ll_pp_extent_lock);
-        return 0;
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (k = 0; k < LL_PROCESS_HIST_MAX; k++) {
+               if (io_extents->pp_extents[k].pid != 0) {
+                       seq_printf(seq, "\nPID: %d\n",
+                                  io_extents->pp_extents[k].pid);
+                       ll_display_extents_info(io_extents, seq, k);
+               }
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
+       return 0;
 }
 
 static ssize_t ll_rw_extents_stats_pp_seq_write(struct file *file,
-                                                const char *buf, size_t len,
-                                                loff_t *off)
+                                               const char __user *buf,
+                                               size_t len,
+                                               loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
-        int i;
-
-        sbi->ll_rw_stats_on = 1;
-        spin_lock(&sbi->ll_pp_extent_lock);
-        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
-                io_extents->pp_extents[i].pid = 0;
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
-        }
-        spin_unlock(&sbi->ll_pp_extent_lock);
-        return len;
+       struct seq_file *seq = file->private_data;
+       struct ll_sb_info *sbi = seq->private;
+       struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+       int i;
+       int value = 1, rc = 0;
+
+       if (len == 0)
+               return -EINVAL;
+
+       rc = lprocfs_write_helper(buf, len, &value);
+       if (rc < 0 && len < 16) {
+               char kernbuf[16];
+
+               if (copy_from_user(kernbuf, buf, len))
+                       return -EFAULT;
+               kernbuf[len] = 0;
+
+               if (kernbuf[len - 1] == '\n')
+                       kernbuf[len - 1] = 0;
+
+               if (strcmp(kernbuf, "disabled") == 0 ||
+                   strcmp(kernbuf, "Disabled") == 0)
+                       value = 0;
+       }
+
+       if (value == 0)
+               sbi->ll_rw_stats_on = 0;
+       else
+               sbi->ll_rw_stats_on = 1;
+
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+               io_extents->pp_extents[i].pid = 0;
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
+       return len;
 }
 
 LPROC_SEQ_FOPS(ll_rw_extents_stats_pp);
 
 static int ll_rw_extents_stats_seq_show(struct seq_file *seq, void *v)
 {
-        struct timeval now;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+       struct timeval now;
+       struct ll_sb_info *sbi = seq->private;
+       struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
 
-        do_gettimeofday(&now);
+       do_gettimeofday(&now);
 
-        if (!sbi->ll_rw_stats_on) {
-                seq_printf(seq, "Disabled\n"
-                                "Write anything in this file to activate\n");
+       if (!sbi->ll_rw_stats_on) {
+                seq_printf(seq, "disabled\n"
+                                "write anything in this file to activate, "
+                                "then 0 or \"[D/d]isabled\" to deactivate\n");
                 return 0;
         }
         seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
                    now.tv_sec, now.tv_usec);
 
         seq_printf(seq, "%15s %19s       | %20s\n", " ", "read", "write");
-        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n", 
+        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n",
                    "extents", "calls", "%", "cum%",
                    "calls", "%", "cum%");
-        spin_lock(&sbi->ll_lock);
-        ll_display_extents_info(io_extents, seq, LL_PROCESS_HIST_MAX);
-        spin_unlock(&sbi->ll_lock);
+       spin_lock(&sbi->ll_lock);
+       ll_display_extents_info(io_extents, seq, LL_PROCESS_HIST_MAX);
+       spin_unlock(&sbi->ll_lock);
 
-        return 0;
+       return 0;
 }
 
-static ssize_t ll_rw_extents_stats_seq_write(struct file *file, const char *buf,
-                                        size_t len, loff_t *off)
+static ssize_t ll_rw_extents_stats_seq_write(struct file *file,
+                                            const char __user *buf,
+                                            size_t len, loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
-        int i;
-
-        sbi->ll_rw_stats_on = 1;
-        spin_lock(&sbi->ll_pp_extent_lock);
-        for(i = 0; i <= LL_PROCESS_HIST_MAX; i++)
-        {
-                io_extents->pp_extents[i].pid = 0;
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
-                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
-        }
-        spin_unlock(&sbi->ll_pp_extent_lock);
-
-        return len;
+       struct seq_file *seq = file->private_data;
+       struct ll_sb_info *sbi = seq->private;
+       struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+       int i;
+       int value = 1, rc = 0;
+
+       if (len == 0)
+               return -EINVAL;
+
+       rc = lprocfs_write_helper(buf, len, &value);
+       if (rc < 0 && len < 16) {
+               char kernbuf[16];
+
+               if (copy_from_user(kernbuf, buf, len))
+                       return -EFAULT;
+               kernbuf[len] = 0;
+
+               if (kernbuf[len - 1] == '\n')
+                       kernbuf[len - 1] = 0;
+
+               if (strcmp(kernbuf, "disabled") == 0 ||
+                   strcmp(kernbuf, "Disabled") == 0)
+                       value = 0;
+       }
+
+       if (value == 0)
+               sbi->ll_rw_stats_on = 0;
+       else
+               sbi->ll_rw_stats_on = 1;
+
+       spin_lock(&sbi->ll_pp_extent_lock);
+       for (i = 0; i <= LL_PROCESS_HIST_MAX; i++) {
+               io_extents->pp_extents[i].pid = 0;
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+               lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+       }
+       spin_unlock(&sbi->ll_pp_extent_lock);
+
+       return len;
 }
-
 LPROC_SEQ_FOPS(ll_rw_extents_stats);
 
-void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
-                               *file, size_t count, int rw)
+void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
+                       struct ll_file_data *file, loff_t pos,
+                       size_t count, int rw)
 {
         int i, cur = -1;
         struct ll_rw_process_info *process;
@@ -1159,7 +1497,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
         process = sbi->ll_rw_process_info;
         offset = sbi->ll_rw_offset_info;
 
-        spin_lock(&sbi->ll_pp_extent_lock);
+       spin_lock(&sbi->ll_pp_extent_lock);
         /* Extent statistics */
         for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
                 if(io_extents->pp_extents[i].pid == pid) {
@@ -1170,7 +1508,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
 
         if (cur == -1) {
                 /* new process */
-                sbi->ll_extent_process_count = 
+                sbi->ll_extent_process_count =
                         (sbi->ll_extent_process_count + 1) % LL_PROCESS_HIST_MAX;
                 cur = sbi->ll_extent_process_count;
                 io_extents->pp_extents[cur].pid = pid;
@@ -1178,7 +1516,7 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
                 lprocfs_oh_clear(&io_extents->pp_extents[cur].pp_w_hist);
         }
 
-        for(i = 0; (count >= (1 << LL_HIST_START << i)) && 
+        for(i = 0; (count >= (1 << LL_HIST_START << i)) &&
              (i < (LL_HIST_MAX - 1)); i++);
         if (rw == 0) {
                 io_extents->pp_extents[cur].pp_r_hist.oh_buckets[i]++;
@@ -1187,24 +1525,23 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
                 io_extents->pp_extents[cur].pp_w_hist.oh_buckets[i]++;
                 io_extents->pp_extents[LL_PROCESS_HIST_MAX].pp_w_hist.oh_buckets[i]++;
         }
-        spin_unlock(&sbi->ll_pp_extent_lock);
+       spin_unlock(&sbi->ll_pp_extent_lock);
 
-        spin_lock(&sbi->ll_process_lock);
+       spin_lock(&sbi->ll_process_lock);
         /* Offset statistics */
         for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
                 if (process[i].rw_pid == pid) {
                         if (process[i].rw_last_file != file) {
-                                process[i].rw_range_start = file->f_pos;
-                                process[i].rw_last_file_pos =
-                                                        file->f_pos + count;
+                                process[i].rw_range_start = pos;
+                                process[i].rw_last_file_pos = pos + count;
                                 process[i].rw_smallest_extent = count;
                                 process[i].rw_largest_extent = count;
                                 process[i].rw_offset = 0;
                                 process[i].rw_last_file = file;
-                                spin_unlock(&sbi->ll_process_lock);
+                               spin_unlock(&sbi->ll_process_lock);
                                 return;
                         }
-                        if (process[i].rw_last_file_pos != file->f_pos) {
+                        if (process[i].rw_last_file_pos != pos) {
                                 *off_count =
                                     (*off_count + 1) % LL_OFFSET_HIST_MAX;
                                 offset[*off_count].rw_op = process[i].rw_op;
@@ -1220,117 +1557,135 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
                                 offset[*off_count].rw_offset =
                                         process[i].rw_offset;
                                 process[i].rw_op = rw;
-                                process[i].rw_range_start = file->f_pos;
+                                process[i].rw_range_start = pos;
                                 process[i].rw_smallest_extent = count;
                                 process[i].rw_largest_extent = count;
-                                process[i].rw_offset = file->f_pos -
+                                process[i].rw_offset = pos -
                                         process[i].rw_last_file_pos;
                         }
                         if(process[i].rw_smallest_extent > count)
                                 process[i].rw_smallest_extent = count;
                         if(process[i].rw_largest_extent < count)
                                 process[i].rw_largest_extent = count;
-                        process[i].rw_last_file_pos = file->f_pos + count;
-                        spin_unlock(&sbi->ll_process_lock);
+                        process[i].rw_last_file_pos = pos + count;
+                       spin_unlock(&sbi->ll_process_lock);
                         return;
                 }
         }
         *process_count = (*process_count + 1) % LL_PROCESS_HIST_MAX;
         process[*process_count].rw_pid = pid;
         process[*process_count].rw_op = rw;
-        process[*process_count].rw_range_start = file->f_pos;
-        process[*process_count].rw_last_file_pos = file->f_pos + count;
+        process[*process_count].rw_range_start = pos;
+        process[*process_count].rw_last_file_pos = pos + count;
         process[*process_count].rw_smallest_extent = count;
         process[*process_count].rw_largest_extent = count;
         process[*process_count].rw_offset = 0;
         process[*process_count].rw_last_file = file;
-        spin_unlock(&sbi->ll_process_lock);
+       spin_unlock(&sbi->ll_process_lock);
 }
 
-char lpszt[] = LPSZ;
-
 static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v)
 {
         struct timeval now;
         struct ll_sb_info *sbi = seq->private;
         struct ll_rw_process_info *offset = sbi->ll_rw_offset_info;
         struct ll_rw_process_info *process = sbi->ll_rw_process_info;
-        char format[50];
-        int i;
+       int i;
 
-        do_gettimeofday(&now);
+       do_gettimeofday(&now);
 
-        if (!sbi->ll_rw_stats_on) {
-                seq_printf(seq, "Disabled\n"
-                                "Write anything in this file to activate\n");
+       if (!sbi->ll_rw_stats_on) {
+                seq_printf(seq, "disabled\n"
+                                "write anything in this file to activate, "
+                                "then 0 or \"[D/d]isabled\" to deactivate\n");
                 return 0;
         }
-        spin_lock(&sbi->ll_process_lock);
+       spin_lock(&sbi->ll_process_lock);
 
         seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
                    now.tv_sec, now.tv_usec);
         seq_printf(seq, "%3s %10s %14s %14s %17s %17s %14s\n",
                    "R/W", "PID", "RANGE START", "RANGE END",
                    "SMALLEST EXTENT", "LARGEST EXTENT", "OFFSET");
-        sprintf(format, "%s%s%s%s%s\n",
-                "%3c %10d %14Lu %14Lu %17", lpszt+1, " %17", lpszt+1, " %14Ld");
-        /* We stored the discontiguous offsets here; print them first */
-        for(i = 0; i < LL_OFFSET_HIST_MAX; i++) {
-                if (offset[i].rw_pid != 0)
-                        /* Is there a way to snip the '%' off of LPSZ? */
-                        seq_printf(seq, format,
-                                   offset[i].rw_op ? 'W' : 'R',
-                                   offset[i].rw_pid,
-                                   offset[i].rw_range_start,
-                                   offset[i].rw_range_end,
-                                   offset[i].rw_smallest_extent,
-                                   offset[i].rw_largest_extent,
-                                   offset[i].rw_offset);
-        }
-        /* Then print the current offsets for each process */
-        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
-                if (process[i].rw_pid != 0)
-                        seq_printf(seq, format,
-                                   process[i].rw_op ? 'W' : 'R',
-                                   process[i].rw_pid,
-                                   process[i].rw_range_start,
-                                   process[i].rw_last_file_pos,
-                                   process[i].rw_smallest_extent,
-                                   process[i].rw_largest_extent,
-                                   process[i].rw_offset);
-        }
-        spin_unlock(&sbi->ll_process_lock);
 
-        return 0;
+       /* We stored the discontiguous offsets here; print them first */
+       for (i = 0; i < LL_OFFSET_HIST_MAX; i++) {
+               if (offset[i].rw_pid != 0)
+                       seq_printf(seq,
+                                  "%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",
+                                  offset[i].rw_op == READ ? 'R' : 'W',
+                                  offset[i].rw_pid,
+                                  offset[i].rw_range_start,
+                                  offset[i].rw_range_end,
+                                  (unsigned long)offset[i].rw_smallest_extent,
+                                  (unsigned long)offset[i].rw_largest_extent,
+                                  offset[i].rw_offset);
+       }
+
+       /* Then print the current offsets for each process */
+       for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+               if (process[i].rw_pid != 0)
+                       seq_printf(seq,
+                                  "%3c %10d %14Lu %14Lu %17lu %17lu %14Lu",
+                                  process[i].rw_op == READ ? 'R' : 'W',
+                                  process[i].rw_pid,
+                                  process[i].rw_range_start,
+                                  process[i].rw_last_file_pos,
+                                  (unsigned long)process[i].rw_smallest_extent,
+                                  (unsigned long)process[i].rw_largest_extent,
+                                  process[i].rw_offset);
+       }
+       spin_unlock(&sbi->ll_process_lock);
+
+       return 0;
 }
 
-static ssize_t ll_rw_offset_stats_seq_write(struct file *file, const char *buf,
-                                       size_t len, loff_t *off)
+static ssize_t ll_rw_offset_stats_seq_write(struct file *file,
+                                           const char __user *buf,
+                                           size_t len, loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct ll_sb_info *sbi = seq->private;
-        struct ll_rw_process_info *process_info = sbi->ll_rw_process_info;
-        struct ll_rw_process_info *offset_info = sbi->ll_rw_offset_info;
-
-        sbi->ll_rw_stats_on = 1;
-
-        spin_lock(&sbi->ll_process_lock);
-        sbi->ll_offset_process_count = 0;
-        sbi->ll_rw_offset_entry_count = 0;
-        memset(process_info, 0, sizeof(struct ll_rw_process_info) *
-               LL_PROCESS_HIST_MAX);
-        memset(offset_info, 0, sizeof(struct ll_rw_process_info) *
-               LL_OFFSET_HIST_MAX);
-        spin_unlock(&sbi->ll_process_lock);
-
-        return len;
+       struct seq_file *seq = file->private_data;
+       struct ll_sb_info *sbi = seq->private;
+       struct ll_rw_process_info *process_info = sbi->ll_rw_process_info;
+       struct ll_rw_process_info *offset_info = sbi->ll_rw_offset_info;
+       int value = 1, rc = 0;
+
+       if (len == 0)
+               return -EINVAL;
+
+       rc = lprocfs_write_helper(buf, len, &value);
+
+       if (rc < 0 && len < 16) {
+               char kernbuf[16];
+
+               if (copy_from_user(kernbuf, buf, len))
+                       return -EFAULT;
+               kernbuf[len] = 0;
+
+               if (kernbuf[len - 1] == '\n')
+                       kernbuf[len - 1] = 0;
+
+               if (strcmp(kernbuf, "disabled") == 0 ||
+                   strcmp(kernbuf, "Disabled") == 0)
+                       value = 0;
+       }
+
+       if (value == 0)
+               sbi->ll_rw_stats_on = 0;
+       else
+               sbi->ll_rw_stats_on = 1;
+
+       spin_lock(&sbi->ll_process_lock);
+       sbi->ll_offset_process_count = 0;
+       sbi->ll_rw_offset_entry_count = 0;
+       memset(process_info, 0, sizeof(struct ll_rw_process_info) *
+              LL_PROCESS_HIST_MAX);
+       memset(offset_info, 0, sizeof(struct ll_rw_process_info) *
+              LL_OFFSET_HIST_MAX);
+       spin_unlock(&sbi->ll_process_lock);
+
+       return len;
 }
 
 LPROC_SEQ_FOPS(ll_rw_offset_stats);
-
-void lprocfs_llite_init_vars(struct lprocfs_static_vars *lvars)
-{
-    lvars->module_vars  = NULL;
-    lvars->obd_vars     = lprocfs_llite_obd_vars;
-}
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */