X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Flproc_osc.c;h=b93dcb1b7e7f74193b344794877993238e042a41;hp=7e0c55038bba495843286c3ca57e50c76638552e;hb=HEAD;hpb=79c00733d0b4f8662b630fa2c6c1d475eb7556d2;ds=sidebyside

diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 7e0c550..0bce55b 100644
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -15,11 +15,7 @@
  *
  * 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
- *
- * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,11 +23,10 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
@@ -41,116 +36,137 @@
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <linux/seq_file.h>
+#include <lustre_osc.h>
+
 #include "osc_internal.h"
 
-#ifdef LPROCFS
-static int osc_active_seq_show(struct seq_file *m, void *v)
+static ssize_t active_show(struct kobject *kobj, struct attribute *attr,
+			   char *buf)
 {
-	struct obd_device *dev = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
 	int rc;
 
-	LPROCFS_CLIMP_CHECK(dev);
-	rc = seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive);
-	LPROCFS_CLIMP_EXIT(dev);
+	with_imp_locked(obd, imp, rc)
+		rc = sprintf(buf, "%d\n", !imp->imp_deactive);
+
 	return rc;
 }
 
-static ssize_t osc_active_seq_write(struct file *file,
-				    const char __user *buffer,
-				    size_t count, loff_t *off)
+static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
+			    const char *buffer, size_t count)
 {
-	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp, *imp0;
+	bool val;
+	int rc;
 
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-        if (val < 0 || val > 1)
-                return -ERANGE;
+	rc = kstrtobool(buffer, &val);
+	if (rc)
+		return rc;
 
-        /* opposite senses */
-        if (dev->u.cli.cl_import->imp_deactive == val)
-                rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val);
-        else
-                CDEBUG(D_CONFIG, "activate %d: ignoring repeat request\n", val);
+	with_imp_locked(obd, imp0, rc)
+		imp = class_import_get(imp0);
+	if (rc)
+		return rc;
+	/* opposite senses */
+	if (imp->imp_deactive == val)
+		rc = ptlrpc_set_import_active(imp, val);
+	else
+		CDEBUG(D_CONFIG, "activate %u: ignoring repeat request\n",
+		       (unsigned int)val);
+	class_import_put(imp);
 
-        return count;
+	return rc ?: count;
 }
-LPROC_SEQ_FOPS(osc_active);
+LUSTRE_RW_ATTR(active);
 
-static int osc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v)
+static ssize_t max_rpcs_in_flight_show(struct kobject *kobj,
+				       struct attribute *attr,
+				       char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	int rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
 
-	spin_lock(&cli->cl_loi_list_lock);
-	rc = seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight);
-	spin_unlock(&cli->cl_loi_list_lock);
-	return rc;
+	return  scnprintf(buf, PAGE_SIZE, "%u\n", cli->cl_max_rpcs_in_flight);
 }
 
-static ssize_t osc_max_rpcs_in_flight_seq_write(struct file *file,
-						const char __user *buffer,
-						size_t count, loff_t *off)
+static ssize_t max_rpcs_in_flight_store(struct kobject *kobj,
+					struct attribute *attr,
+					const char *buffer,
+					size_t count)
 {
-	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        struct client_obd *cli = &dev->u.cli;
-        struct ptlrpc_request_pool *pool = cli->cl_import->imp_rq_pool;
-        int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
+	int adding, added, req_count;
+	unsigned int val;
+	int rc;
 
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+	rc = kstrtouint(buffer, 0, &val);
+	if (rc)
+		return rc;
 
-        if (val < 1 || val > OSC_MAX_RIF_MAX)
-                return -ERANGE;
+	if (val == 0 || val > OSC_MAX_RIF_MAX)
+		return -ERANGE;
 
-        LPROCFS_CLIMP_CHECK(dev);
-        if (pool && val > cli->cl_max_rpcs_in_flight)
-                pool->prp_populate(pool, val-cli->cl_max_rpcs_in_flight);
+	adding = (int)val - cli->cl_max_rpcs_in_flight;
+	req_count = atomic_read(&osc_pool_req_count);
+	if (adding > 0 && req_count < osc_reqpool_maxreqcount) {
+		/*
+		 * There might be some race which will cause over-limit
+		 * allocation, but it is fine.
+		 */
+		if (req_count + adding > osc_reqpool_maxreqcount)
+			adding = osc_reqpool_maxreqcount - req_count;
+
+		added = osc_rq_pool->prp_populate(osc_rq_pool, adding);
+		atomic_add(added, &osc_pool_req_count);
+	}
 
 	spin_lock(&cli->cl_loi_list_lock);
 	cli->cl_max_rpcs_in_flight = val;
 	client_adjust_max_dirty(cli);
 	spin_unlock(&cli->cl_loi_list_lock);
 
-	LPROCFS_CLIMP_EXIT(dev);
 	return count;
 }
-LPROC_SEQ_FOPS(osc_max_rpcs_in_flight);
+LUSTRE_RW_ATTR(max_rpcs_in_flight);
 
-static int osc_max_dirty_mb_seq_show(struct seq_file *m, void *v)
+static ssize_t max_dirty_mb_show(struct kobject *kobj,
+				 struct attribute *attr,
+				 char *buf)
 {
-	struct obd_device *dev = m->private;
-        struct client_obd *cli = &dev->u.cli;
-        long val;
-        int mult;
-
-	spin_lock(&cli->cl_loi_list_lock);
-	val = cli->cl_dirty_max_pages;
-	spin_unlock(&cli->cl_loi_list_lock);
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
 
-	mult = 1 << (20 - PAGE_CACHE_SHIFT);
-	return lprocfs_seq_read_frac_helper(m, val, mult);
+	return scnprintf(buf, PAGE_SIZE, "%lu\n",
+			 PAGES_TO_MiB(cli->cl_dirty_max_pages));
 }
 
-static ssize_t osc_max_dirty_mb_seq_write(struct file *file,
-					  const char __user *buffer,
-					  size_t count, loff_t *off)
+static ssize_t max_dirty_mb_store(struct kobject *kobj,
+				  struct attribute *attr,
+				  const char *buffer,
+				  size_t count)
 {
-	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-	struct client_obd *cli = &dev->u.cli;
-	int pages_number, mult, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
+	unsigned long pages_number, max_dirty_mb;
+	int rc;
 
-	mult = 1 << (20 - PAGE_CACHE_SHIFT);
-	rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+	rc = kstrtoul(buffer, 10, &max_dirty_mb);
 	if (rc)
 		return rc;
 
-	if (pages_number <= 0 ||
-	    pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_CACHE_SHIFT) ||
-	    pages_number > totalram_pages / 4) /* 1/4 of RAM */
+	pages_number = MiB_TO_PAGES(max_dirty_mb);
+
+	if (pages_number >= MiB_TO_PAGES(OSC_MAX_DIRTY_MB_MAX) ||
+	    pages_number > cfs_totalram_pages() / 4) /* 1/4 of RAM */
 		return -ERANGE;
 
 	spin_lock(&cli->cl_loi_list_lock);
@@ -160,36 +176,41 @@ static ssize_t osc_max_dirty_mb_seq_write(struct file *file,
 
 	return count;
 }
-LPROC_SEQ_FOPS(osc_max_dirty_mb);
+LUSTRE_RW_ATTR(max_dirty_mb);
+
+LUSTRE_ATTR(ost_conn_uuid, 0444, conn_uuid_show, NULL);
+LUSTRE_RO_ATTR(conn_uuid);
+
+LUSTRE_RW_ATTR(ping);
 
 static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	int shift = 20 - PAGE_CACHE_SHIFT;
-	int rc;
+	struct obd_device *obd = m->private;
+	struct client_obd *cli = &obd->u.cli;
+	int shift = 20 - PAGE_SHIFT;
 
-	rc = seq_printf(m,
-		      "used_mb: %ld\n"
-		      "busy_cnt: %ld\n",
-		      (atomic_long_read(&cli->cl_lru_in_list) +
-			atomic_long_read(&cli->cl_lru_busy)) >> shift,
-		      atomic_long_read(&cli->cl_lru_busy));
+	seq_printf(m, "used_mb: %ld\n"
+		   "busy_cnt: %ld\n"
+		   "reclaim: %llu\n",
+		   (atomic_long_read(&cli->cl_lru_in_list) +
+		    atomic_long_read(&cli->cl_lru_busy)) >> shift,
+		    atomic_long_read(&cli->cl_lru_busy),
+		   cli->cl_lru_reclaim);
 
-	return rc;
+	return 0;
 }
 
 /* shrink the number of caching pages to a specific number */
-static ssize_t
-osc_cached_mb_seq_write(struct file *file, const char __user *buffer,
-			size_t count, loff_t *off)
-{
-	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-	struct client_obd *cli = &dev->u.cli;
-	__u64 val;
-	long pages_number;
+static ssize_t osc_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 obd_device *obd = m->private;
+	struct client_obd *cli = &obd->u.cli;
+	u64 pages_number;
+	const char *tmp;
 	long rc;
-	int mult;
 	char kernbuf[128];
 
 	if (count >= sizeof(kernbuf))
@@ -199,25 +220,17 @@ osc_cached_mb_seq_write(struct file *file, const char __user *buffer,
 		return -EFAULT;
 	kernbuf[count] = 0;
 
-	mult = 1 << (20 - PAGE_CACHE_SHIFT);
-	buffer += lprocfs_find_named_value(kernbuf, "used_mb:", &count) -
-		  kernbuf;
-	rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult);
-
-	if (rc)
+	tmp = lprocfs_find_named_value(kernbuf, "used_mb:", &count);
+	rc = sysfs_memparse(tmp, count, &pages_number, "MiB");
+	if (rc < 0)
 		return rc;
 
-	if (val > LONG_MAX)
-		return -ERANGE;
-	pages_number = (long)val;
-
-	if (pages_number < 0)
-		return -ERANGE;
+	pages_number >>= PAGE_SHIFT;
 
 	rc = atomic_long_read(&cli->cl_lru_in_list) - pages_number;
 	if (rc > 0) {
 		struct lu_env *env;
-		int refcheck;
+		__u16 refcheck;
 
 		env = cl_env_get(&refcheck);
 		if (!IS_ERR(env)) {
@@ -228,163 +241,202 @@ osc_cached_mb_seq_write(struct file *file, const char __user *buffer,
 
 	return count;
 }
+
 LPROC_SEQ_FOPS(osc_cached_mb);
 
-static int osc_cur_dirty_bytes_seq_show(struct seq_file *m, void *v)
+static ssize_t cur_dirty_bytes_show(struct kobject *kobj,
+				    struct attribute *attr,
+				    char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	int rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
 
-	spin_lock(&cli->cl_loi_list_lock);
-	rc = seq_printf(m, "%lu\n", cli->cl_dirty_pages << PAGE_CACHE_SHIFT);
-	spin_unlock(&cli->cl_loi_list_lock);
-	return rc;
+	return scnprintf(buf, PAGE_SIZE, "%lu\n",
+			 cli->cl_dirty_pages << PAGE_SHIFT);
 }
-LPROC_SEQ_FOPS_RO(osc_cur_dirty_bytes);
+LUSTRE_RO_ATTR(cur_dirty_bytes);
 
 static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	int rc;
+	struct obd_device *obd = m->private;
+	struct client_obd *cli = &obd->u.cli;
 
-	spin_lock(&cli->cl_loi_list_lock);
-	rc = seq_printf(m, "%lu\n", cli->cl_avail_grant);
-	spin_unlock(&cli->cl_loi_list_lock);
-	return rc;
+	seq_printf(m, "%lu\n", cli->cl_avail_grant);
+	return 0;
 }
 
 static ssize_t osc_cur_grant_bytes_seq_write(struct file *file,
 					     const char __user *buffer,
 					     size_t count, loff_t *off)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-        struct client_obd *cli = &obd->u.cli;
-        int                rc;
-        __u64              val;
+	struct seq_file *m = file->private_data;
+	struct obd_device *obd = m->private;
+	struct client_obd *cli = &obd->u.cli;
+	struct obd_import *imp;
+	char kernbuf[22] = "";
+	u64 val;
+	int rc;
+
+	if (obd == NULL)
+		return 0;
 
-        if (obd == NULL)
-                return 0;
+	if (count >= sizeof(kernbuf))
+		return -EINVAL;
 
-        rc = lprocfs_write_u64_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+	if (copy_from_user(kernbuf, buffer, count))
+		return -EFAULT;
+	kernbuf[count] = 0;
 
-        /* this is only for shrinking grant */
-	spin_lock(&cli->cl_loi_list_lock);
-	if (val >= cli->cl_avail_grant) {
-		spin_unlock(&cli->cl_loi_list_lock);
+	rc = sysfs_memparse(kernbuf, count, &val, "MiB");
+	if (rc < 0)
+		return rc;
+
+	/* this is only for shrinking grant */
+	if (val >= cli->cl_avail_grant)
 		return 0;
-	}
 
-	spin_unlock(&cli->cl_loi_list_lock);
+	with_imp_locked(obd, imp, rc)
+		if (imp->imp_state == LUSTRE_IMP_FULL)
+			rc = osc_shrink_grant_to_target(cli, val);
 
-        LPROCFS_CLIMP_CHECK(obd);
-        if (cli->cl_import->imp_state == LUSTRE_IMP_FULL)
-                rc = osc_shrink_grant_to_target(cli, val);
-        LPROCFS_CLIMP_EXIT(obd);
-        if (rc)
-                return rc;
-        return count;
+	return rc ? rc : count;
 }
 LPROC_SEQ_FOPS(osc_cur_grant_bytes);
 
-static int osc_cur_lost_grant_bytes_seq_show(struct seq_file *m, void *v)
+static ssize_t cur_lost_grant_bytes_show(struct kobject *kobj,
+					 struct attribute *attr,
+					 char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	int rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
 
-	spin_lock(&cli->cl_loi_list_lock);
-	rc = seq_printf(m, "%lu\n", cli->cl_lost_grant);
-	spin_unlock(&cli->cl_loi_list_lock);
-	return rc;
+	return scnprintf(buf, PAGE_SIZE, "%lu\n", cli->cl_lost_grant);
 }
-LPROC_SEQ_FOPS_RO(osc_cur_lost_grant_bytes);
+LUSTRE_RO_ATTR(cur_lost_grant_bytes);
 
-static int osc_grant_shrink_interval_seq_show(struct seq_file *m, void *v)
+static ssize_t cur_dirty_grant_bytes_show(struct kobject *kobj,
+					  struct attribute *attr,
+					  char *buf)
 {
-	struct obd_device *obd = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct client_obd *cli = &obd->u.cli;
 
-	if (obd == NULL)
-		return 0;
-	return seq_printf(m, "%d\n",
-			  obd->u.cli.cl_grant_shrink_interval);
+	return scnprintf(buf, PAGE_SIZE, "%lu\n", cli->cl_dirty_grant);
 }
+LUSTRE_RO_ATTR(cur_dirty_grant_bytes);
 
-static ssize_t osc_grant_shrink_interval_seq_write(struct file *file,
-						   const char __user *buffer,
-						   size_t count, loff_t *off)
+static ssize_t grant_shrink_interval_show(struct kobject *kobj,
+					  struct attribute *attr,
+					  char *buf)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	if (obd == NULL)
-		return 0;
+	return sprintf(buf, "%lld\n", obd->u.cli.cl_grant_shrink_interval);
+}
 
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+static ssize_t grant_shrink_interval_store(struct kobject *kobj,
+					   struct attribute *attr,
+					   const char *buffer,
+					   size_t count)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	unsigned int val;
+	int rc;
 
-        if (val <= 0)
-                return -ERANGE;
+	rc = kstrtouint(buffer, 0, &val);
+	if (rc)
+		return rc;
+
+	if (val == 0)
+		return -ERANGE;
 
-        obd->u.cli.cl_grant_shrink_interval = val;
+	obd->u.cli.cl_grant_shrink_interval = val;
+	osc_update_next_shrink(&obd->u.cli);
+	osc_schedule_grant_work();
 
-        return count;
+	return count;
 }
-LPROC_SEQ_FOPS(osc_grant_shrink_interval);
+LUSTRE_RW_ATTR(grant_shrink_interval);
 
-static int osc_checksum_seq_show(struct seq_file *m, void *v)
+static ssize_t enable_page_cache_shrink_show(struct kobject *kobj,
+					     struct attribute *attr,
+					     char *buf)
 {
-	struct obd_device *obd = m->private;
+	return scnprintf(buf, PAGE_SIZE, "%d\n", osc_page_cache_shrink_enabled);
+}
 
-	if (obd == NULL)
-		return 0;
+static ssize_t enable_page_cache_shrink_store(struct kobject *kobj,
+					      struct attribute *attr,
+					      const char *buffer,
+					      size_t count)
+{
+	bool val;
+	int rc;
+
+	rc = kstrtobool(buffer, &val);
+	if (rc)
+		return rc;
 
-	return seq_printf(m, "%d\n",
-			  obd->u.cli.cl_checksum ? 1 : 0);
+	osc_page_cache_shrink_enabled = val;
+	return count;
 }
+LUSTRE_RW_ATTR(enable_page_cache_shrink);
 
-static ssize_t osc_checksum_seq_write(struct file *file,
-				      const char __user *buffer,
-				      size_t count, loff_t *off)
+static ssize_t checksums_show(struct kobject *kobj,
+			      struct attribute *attr,
+			      char *buf)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+
+	return scnprintf(buf, PAGE_SIZE, "%d\n", !!obd->u.cli.cl_checksum);
+}
 
-        if (obd == NULL)
-                return 0;
+static ssize_t checksums_store(struct kobject *kobj,
+			       struct attribute *attr,
+			       const char *buffer,
+			       size_t count)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	bool val;
+	int rc;
 
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+	rc = kstrtobool(buffer, &val);
+	if (rc)
+		return rc;
 
-        obd->u.cli.cl_checksum = (val ? 1 : 0);
+	obd->u.cli.cl_checksum = val;
 
-        return count;
+	return count;
 }
-LPROC_SEQ_FOPS(osc_checksum);
+LUSTRE_RW_ATTR(checksums);
+
+DECLARE_CKSUM_NAME;
 
 static int osc_checksum_type_seq_show(struct seq_file *m, void *v)
 {
 	struct obd_device *obd = m->private;
 	int i;
-	DECLARE_CKSUM_NAME;
 
-        if (obd == NULL)
-                return 0;
+	if (obd == NULL)
+		return 0;
 
 	for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
-		if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
+		if ((BIT(i) & obd->u.cli.cl_supp_cksum_types) == 0)
 			continue;
-		if (obd->u.cli.cl_cksum_type == (1 << i))
+		if (obd->u.cli.cl_cksum_type == BIT(i))
 			seq_printf(m, "[%s] ", cksum_name[i]);
 		else
 			seq_printf(m, "%s ", cksum_name[i]);
 	}
-	seq_printf(m, "\n");
+	seq_puts(m, "\n");
+
 	return 0;
 }
 
@@ -392,241 +444,279 @@ static ssize_t osc_checksum_type_seq_write(struct file *file,
 					   const char __user *buffer,
 					   size_t count, loff_t *off)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-	int i;
-	DECLARE_CKSUM_NAME;
+	struct seq_file *m = file->private_data;
+	struct obd_device *obd = m->private;
 	char kernbuf[10];
+	int rc = -EINVAL;
+	int i;
 
-        if (obd == NULL)
-                return 0;
+	if (obd == NULL)
+		return 0;
 
-        if (count > sizeof(kernbuf) - 1)
-                return -EINVAL;
+	if (count > sizeof(kernbuf) - 1)
+		return -EINVAL;
 	if (copy_from_user(kernbuf, buffer, count))
-                return -EFAULT;
-        if (count > 0 && kernbuf[count - 1] == '\n')
-                kernbuf[count - 1] = '\0';
-        else
-                kernbuf[count] = '\0';
-
-        for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
-                if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
-                        continue;
-                if (!strcmp(kernbuf, cksum_name[i])) {
-                       obd->u.cli.cl_cksum_type = 1 << i;
-                       return count;
-                }
-        }
-        return -EINVAL;
+		return -EFAULT;
+
+	if (count > 0 && kernbuf[count - 1] == '\n')
+		kernbuf[count - 1] = '\0';
+	else
+		kernbuf[count] = '\0';
+
+	for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
+		if (strcasecmp(kernbuf, cksum_name[i]) == 0) {
+			obd->u.cli.cl_preferred_cksum_type = BIT(i);
+			if (obd->u.cli.cl_supp_cksum_types & BIT(i)) {
+				obd->u.cli.cl_cksum_type = BIT(i);
+				rc = count;
+			} else {
+				rc = -EOPNOTSUPP;
+			}
+			break;
+		}
+	}
+	return rc;
 }
 LPROC_SEQ_FOPS(osc_checksum_type);
 
-static int osc_resend_count_seq_show(struct seq_file *m, void *v)
+static ssize_t resend_count_show(struct kobject *kobj,
+				 struct attribute *attr,
+				 char *buf)
 {
-	struct obd_device *obd = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	return seq_printf(m, "%u\n", atomic_read(&obd->u.cli.cl_resends));
+	return sprintf(buf, "%u\n", atomic_read(&obd->u.cli.cl_resends));
 }
 
-static ssize_t osc_resend_count_seq_write(struct file *file,
-					  const char __user *buffer,
-					  size_t count, loff_t *off)
+static ssize_t resend_count_store(struct kobject *kobj,
+				  struct attribute *attr,
+				  const char *buffer,
+				  size_t count)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	unsigned int val;
+	int rc;
 
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = kstrtouint(buffer, 10, &val);
 	if (rc)
 		return rc;
 
-	if (val < 0)
-		return -EINVAL;
-
 	atomic_set(&obd->u.cli.cl_resends, val);
 
 	return count;
 }
-LPROC_SEQ_FOPS(osc_resend_count);
+LUSTRE_RW_ATTR(resend_count);
 
-static int osc_contention_seconds_seq_show(struct seq_file *m, void *v)
+static ssize_t checksum_dump_show(struct kobject *kobj,
+				  struct attribute *attr,
+				  char *buf)
 {
-	struct obd_device *obd = m->private;
-	struct osc_device *od  = obd2osc_dev(obd);
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	return seq_printf(m, "%u\n", od->od_contention_time);
+	return scnprintf(buf, PAGE_SIZE, "%d\n", !!obd->u.cli.cl_checksum_dump);
 }
 
-static ssize_t osc_contention_seconds_seq_write(struct file *file,
-						const char __user *buffer,
-						size_t count, loff_t *off)
+static ssize_t checksum_dump_store(struct kobject *kobj,
+				   struct attribute *attr,
+				   const char *buffer,
+				   size_t count)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-	struct osc_device *od  = obd2osc_dev(obd);
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	bool val;
+	int rc;
 
-	return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: count;
-}
-LPROC_SEQ_FOPS(osc_contention_seconds);
+	rc = kstrtobool(buffer, &val);
+	if (rc)
+		return rc;
 
-static int osc_lockless_truncate_seq_show(struct seq_file *m, void *v)
-{
-	struct obd_device *obd = m->private;
-	struct osc_device *od  = obd2osc_dev(obd);
+	obd->u.cli.cl_checksum_dump = val;
 
-	return seq_printf(m, "%u\n", od->od_lockless_truncate);
+	return count;
 }
+LUSTRE_RW_ATTR(checksum_dump);
 
-static ssize_t osc_lockless_truncate_seq_write(struct file *file,
-					       const char __user *buffer,
-				    size_t count, loff_t *off)
+static ssize_t destroys_in_flight_show(struct kobject *kobj,
+				       struct attribute *attr,
+				       char *buf)
 {
-	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
-        struct osc_device *od  = obd2osc_dev(obd);
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-        return lprocfs_write_helper(buffer, count, &od->od_lockless_truncate) ?:
-                count;
+	return sprintf(buf, "%u\n",
+		       atomic_read(&obd->u.cli.cl_destroy_in_flight));
 }
-LPROC_SEQ_FOPS(osc_lockless_truncate);
+LUSTRE_RO_ATTR(destroys_in_flight);
 
-static int osc_destroys_in_flight_seq_show(struct seq_file *m, void *v)
+LPROC_SEQ_FOPS_RW_TYPE(osc, obd_max_pages_per_rpc);
+
+LUSTRE_RW_ATTR(short_io_bytes);
+
+#ifdef CONFIG_PROC_FS
+static int osc_unstable_stats_seq_show(struct seq_file *m, void *v)
 {
 	struct obd_device *obd = m->private;
-	return seq_printf(m, "%u\n",
-			  atomic_read(&obd->u.cli.cl_destroy_in_flight));
+	struct client_obd *cli = &obd->u.cli;
+	long pages;
+	int mb;
+
+	pages = atomic_long_read(&cli->cl_unstable_count);
+	mb    = (pages * PAGE_SIZE) >> 20;
+
+	seq_printf(m, "unstable_pages: %20ld\n"
+		   "unstable_mb:              %10d\n",
+		   pages, mb);
+	return 0;
 }
-LPROC_SEQ_FOPS_RO(osc_destroys_in_flight);
+LPROC_SEQ_FOPS_RO(osc_unstable_stats);
 
-static int osc_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v)
+static ssize_t idle_timeout_show(struct kobject *kobj, struct attribute *attr,
+				 char *buf)
 {
-	return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private);
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
+	int ret;
+
+	with_imp_locked(obd, imp, ret)
+		ret = sprintf(buf, "%u\n", imp->imp_idle_timeout);
+
+	return ret;
 }
 
-static ssize_t osc_obd_max_pages_per_rpc_seq_write(struct file *file,
-						   const char __user *buffer,
-						   size_t count, loff_t *off)
+static ssize_t idle_timeout_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buffer, size_t count)
 {
-	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-	struct client_obd *cli = &dev->u.cli;
-	struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data;
-	int chunk_mask, rc;
-	__u64 val;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
+	struct ptlrpc_request *req;
+	unsigned int idle_debug = 0;
+	unsigned int val;
+	int rc;
 
-	rc = lprocfs_write_u64_helper(buffer, count, &val);
-	if (rc)
-		return rc;
+	if (strncmp(buffer, "debug", 5) == 0) {
+		idle_debug = D_CONSOLE;
+	} else if (strncmp(buffer, "nodebug", 6) == 0) {
+		idle_debug = D_HA;
+	} else {
+		rc = kstrtouint(buffer, 10, &val);
+		if (rc)
+			return rc;
+
+		if (val > CONNECTION_SWITCH_MAX)
+			return -ERANGE;
+	}
 
-	/* if the max_pages is specified in bytes, convert to pages */
-	if (val >= ONE_MB_BRW_SIZE)
-		val >>= PAGE_CACHE_SHIFT;
+	with_imp_locked(obd, imp, rc) {
+		if (idle_debug) {
+			imp->imp_idle_debug = idle_debug;
+		} else {
+			if (!val) {
+				/* initiate the connection if it's in IDLE state */
+				req = ptlrpc_request_alloc(imp,
+							   &RQF_OST_STATFS);
+				if (req != NULL)
+					ptlrpc_req_finished(req);
+			}
+			imp->imp_idle_timeout = val;
+		}
+	}
 
-	LPROCFS_CLIMP_CHECK(dev);
+	return count;
+}
+LUSTRE_RW_ATTR(idle_timeout);
 
-	chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1);
-	/* max_pages_per_rpc must be chunk aligned */
-	val = (val + ~chunk_mask) & chunk_mask;
-	if (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) {
-		LPROCFS_CLIMP_EXIT(dev);
-		return -ERANGE;
+static ssize_t idle_connect_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buffer, size_t count)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
+	struct ptlrpc_request *req;
+	int rc;
+
+	with_imp_locked(obd, imp, rc) {
+		/* to initiate the connection if it's in IDLE state */
+		req = ptlrpc_request_alloc(imp, &RQF_OST_STATFS);
+		if (req)
+			ptlrpc_req_finished(req);
+		ptlrpc_pinger_force(imp);
 	}
-	spin_lock(&cli->cl_loi_list_lock);
-	cli->cl_max_pages_per_rpc = val;
-	client_adjust_max_dirty(cli);
-	spin_unlock(&cli->cl_loi_list_lock);
 
-	LPROCFS_CLIMP_EXIT(dev);
-	return count;
+	return rc ?: count;
 }
-LPROC_SEQ_FOPS(osc_obd_max_pages_per_rpc);
+LUSTRE_WO_ATTR(idle_connect);
 
-static int osc_unstable_stats_seq_show(struct seq_file *m, void *v)
+static ssize_t grant_shrink_show(struct kobject *kobj, struct attribute *attr,
+				 char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct client_obd *cli = &dev->u.cli;
-	long pages;
-	int mb;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
+	ssize_t len;
 
-	pages = atomic_long_read(&cli->cl_unstable_count);
-	mb    = (pages * PAGE_CACHE_SIZE) >> 20;
+	with_imp_locked(obd, imp, len)
+		len = scnprintf(buf, PAGE_SIZE, "%d\n",
+				!imp->imp_grant_shrink_disabled &&
+				OCD_HAS_FLAG(&imp->imp_connect_data,
+					     GRANT_SHRINK));
 
-	return seq_printf(m, "unstable_pages: %20ld\n"
-			  "unstable_mb:              %10d\n",
-			pages, mb);
+	return len;
 }
-LPROC_SEQ_FOPS_RO(osc_unstable_stats);
 
-LPROC_SEQ_FOPS_RO_TYPE(osc, uuid);
+static ssize_t grant_shrink_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buffer, size_t count)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct obd_import *imp;
+	bool val;
+	int rc;
+
+	if (obd == NULL)
+		return 0;
+
+	rc = kstrtobool(buffer, &val);
+	if (rc)
+		return rc;
+
+	with_imp_locked(obd, imp, rc) {
+		spin_lock(&imp->imp_lock);
+		imp->imp_grant_shrink_disabled = !val;
+		spin_unlock(&imp->imp_lock);
+	}
+
+	return rc ?: count;
+}
+LUSTRE_RW_ATTR(grant_shrink);
+
 LPROC_SEQ_FOPS_RO_TYPE(osc, connect_flags);
-LPROC_SEQ_FOPS_RO_TYPE(osc, blksize);
-LPROC_SEQ_FOPS_RO_TYPE(osc, kbytestotal);
-LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesfree);
-LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesavail);
-LPROC_SEQ_FOPS_RO_TYPE(osc, filestotal);
-LPROC_SEQ_FOPS_RO_TYPE(osc, filesfree);
 LPROC_SEQ_FOPS_RO_TYPE(osc, server_uuid);
-LPROC_SEQ_FOPS_RO_TYPE(osc, conn_uuid);
 LPROC_SEQ_FOPS_RO_TYPE(osc, timeouts);
 LPROC_SEQ_FOPS_RO_TYPE(osc, state);
 
-LPROC_SEQ_FOPS_WO_TYPE(osc, ping);
-
 LPROC_SEQ_FOPS_RW_TYPE(osc, import);
 LPROC_SEQ_FOPS_RW_TYPE(osc, pinger_recov);
 
-struct lprocfs_seq_vars lprocfs_osc_obd_vars[] = {
-	{ .name	=	"uuid",
-	  .fops	=	&osc_uuid_fops			},
-	{ .name	=	"ping",
-	  .fops	=	&osc_ping_fops,
-	  .proc_mode =	0222				},
+struct lprocfs_vars lprocfs_osc_obd_vars[] = {
 	{ .name	=	"connect_flags",
 	  .fops	=	&osc_connect_flags_fops		},
-	{ .name	=	"blocksize",
-	  .fops	=	&osc_blksize_fops		},
-	{ .name	=	"kbytestotal",
-	  .fops	=	&osc_kbytestotal_fops		},
-	{ .name	=	"kbytesfree",
-	  .fops	=	&osc_kbytesfree_fops		},
-	{ .name	=	"kbytesavail",
-	  .fops	=	&osc_kbytesavail_fops		},
-	{ .name	=	"filestotal",
-	  .fops	=	&osc_filestotal_fops		},
-	{ .name	=	"filesfree",
-	  .fops	=	&osc_filesfree_fops		},
 	{ .name	=	"ost_server_uuid",
 	  .fops	=	&osc_server_uuid_fops		},
-	{ .name	=	"ost_conn_uuid",
-	  .fops	=	&osc_conn_uuid_fops		},
-	{ .name	=	"active",
-	  .fops	=	&osc_active_fops		},
-	{ .name	=	"max_pages_per_rpc",
-	  .fops	=	&osc_obd_max_pages_per_rpc_fops	},
-	{ .name	=	"max_rpcs_in_flight",
-	  .fops	=	&osc_max_rpcs_in_flight_fops	},
-	{ .name	=	"destroys_in_flight",
-	  .fops	=	&osc_destroys_in_flight_fops	},
-	{ .name	=	"max_dirty_mb",
-	  .fops	=	&osc_max_dirty_mb_fops		},
+	{ .name =	"max_pages_per_rpc",
+	  .fops =	&osc_obd_max_pages_per_rpc_fops	},
 	{ .name	=	"osc_cached_mb",
 	  .fops	=	&osc_cached_mb_fops		},
-	{ .name	=	"cur_dirty_bytes",
-	  .fops	=	&osc_cur_dirty_bytes_fops	},
-	{ .name	=	"cur_grant_bytes",
-	  .fops	=	&osc_cur_grant_bytes_fops	},
-	{ .name	=	"cur_lost_grant_bytes",
-	  .fops	=	&osc_cur_lost_grant_bytes_fops	},
-	{ .name	=	"grant_shrink_interval",
-	  .fops	=	&osc_grant_shrink_interval_fops	},
-	{ .name	=	"checksums",
-	  .fops	=	&osc_checksum_fops		},
+	{ .name =	"cur_grant_bytes",
+	  .fops =	&osc_cur_grant_bytes_fops	},
 	{ .name	=	"checksum_type",
 	  .fops	=	&osc_checksum_type_fops		},
-	{ .name	=	"resend_count",
-	  .fops	=	&osc_resend_count_fops		},
 	{ .name	=	"timeouts",
 	  .fops	=	&osc_timeouts_fops		},
-	{ .name	=	"contention_seconds",
-	  .fops	=	&osc_contention_seconds_fops	},
-	{ .name	=	"lockless_truncate",
-	  .fops	=	&osc_lockless_truncate_fops	},
 	{ .name	=	"import",
 	  .fops	=	&osc_import_fops		},
 	{ .name	=	"state",
@@ -635,25 +725,20 @@ struct lprocfs_seq_vars lprocfs_osc_obd_vars[] = {
 	  .fops	=	&osc_pinger_recov_fops		},
 	{ .name	=	"unstable_stats",
 	  .fops	=	&osc_unstable_stats_fops	},
-	{ 0 }
+	{ NULL }
 };
 
-#define pct(a,b) (b ? a * 100 / b : 0)
-
 static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
 {
-	struct timeval now;
-	struct obd_device *dev = seq->private;
-	struct client_obd *cli = &dev->u.cli;
+	struct obd_device *obd = seq->private;
+	struct client_obd *cli = &obd->u.cli;
 	unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum;
 	int i;
 
-	do_gettimeofday(&now);
-
 	spin_lock(&cli->cl_loi_list_lock);
 
-	seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-		   now.tv_sec, now.tv_usec);
+	lprocfs_stats_header(seq, ktime_get_real(), cli->cl_stats_init, 25,
+			     ":", true, "");
 	seq_printf(seq, "read RPCs in flight:  %d\n",
 		   cli->cl_r_in_flight);
 	seq_printf(seq, "write RPCs in flight: %d\n",
@@ -678,7 +763,7 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
 
 		read_cum += r;
 		write_cum += w;
-		seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
+		seq_printf(seq, "%d:\t\t%10lu %3u %3u   | %10lu %3u %3u\n",
 			   1 << i, r, pct(r, read_tot),
 			   pct(read_cum, read_tot), w,
 			   pct(w, write_tot),
@@ -696,16 +781,16 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
 
         read_cum = 0;
         write_cum = 0;
-        for (i = 0; i < OBD_HIST_MAX; i++) {
+        for (i = 1; i < OBD_HIST_MAX; i++) {
                 unsigned long r = cli->cl_read_rpc_hist.oh_buckets[i];
                 unsigned long w = cli->cl_write_rpc_hist.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
-                                 pct(w, write_tot),
-                                 pct(write_cum, write_tot));
+		seq_printf(seq, "%d:\t\t%10lu %3u %3u   | %10lu %3u %3u\n",
+			   i, r, pct(r, read_tot),
+			   pct(read_cum, read_tot), w,
+			   pct(w, write_tot),
+			   pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
                         break;
         }
@@ -724,10 +809,10 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = cli->cl_write_offset_hist.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                           (i == 0) ? 0 : 1 << (i - 1),
-                           r, pct(r, read_tot), pct(read_cum, read_tot),
-                           w, pct(w, write_tot), pct(write_cum, write_tot));
+		seq_printf(seq, "%d:\t\t%10lu %3u %3u   | %10lu %3u %3u\n",
+			   (i == 0) ? 0 : 1 << (i - 1),
+			   r, pct(r, read_tot), pct(read_cum, read_tot),
+			   w, pct(w, write_tot), pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
                         break;
         }
@@ -736,43 +821,38 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
 
         return 0;
 }
-#undef pct
 
 static ssize_t osc_rpc_stats_seq_write(struct file *file,
 				       const char __user *buf,
-                                       size_t len, loff_t *off)
+				       size_t len, loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct obd_device *dev = seq->private;
-        struct client_obd *cli = &dev->u.cli;
+	struct seq_file *seq = file->private_data;
+	struct obd_device *obd = seq->private;
+	struct client_obd *cli = &obd->u.cli;
 
-        lprocfs_oh_clear(&cli->cl_read_rpc_hist);
-        lprocfs_oh_clear(&cli->cl_write_rpc_hist);
-        lprocfs_oh_clear(&cli->cl_read_page_hist);
-        lprocfs_oh_clear(&cli->cl_write_page_hist);
-        lprocfs_oh_clear(&cli->cl_read_offset_hist);
-        lprocfs_oh_clear(&cli->cl_write_offset_hist);
+	lprocfs_oh_clear(&cli->cl_read_rpc_hist);
+	lprocfs_oh_clear(&cli->cl_write_rpc_hist);
+	lprocfs_oh_clear(&cli->cl_read_page_hist);
+	lprocfs_oh_clear(&cli->cl_write_page_hist);
+	lprocfs_oh_clear(&cli->cl_read_offset_hist);
+	lprocfs_oh_clear(&cli->cl_write_offset_hist);
+	cli->cl_stats_init = ktime_get_real();
 
-        return len;
+	return len;
 }
 LPROC_SEQ_FOPS(osc_rpc_stats);
 
 static int osc_stats_seq_show(struct seq_file *seq, void *v)
 {
-	struct timeval now;
-	struct obd_device *dev = seq->private;
-	struct osc_stats *stats = &obd2osc_dev(dev)->od_stats;
-
-	do_gettimeofday(&now);
+	struct obd_device *obd = seq->private;
+	struct osc_stats *stats = &obd2osc_dev(obd)->osc_stats;
 
-	seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-		   now.tv_sec, now.tv_usec);
-	seq_printf(seq, "lockless_write_bytes\t\t"LPU64"\n",
+	lprocfs_stats_header(seq, ktime_get_real(), stats->os_init, 25, ":",
+			     true, "");
+	seq_printf(seq, "lockless_write_bytes\t\t%llu\n",
 		   stats->os_lockless_writes);
-	seq_printf(seq, "lockless_read_bytes\t\t"LPU64"\n",
+	seq_printf(seq, "lockless_read_bytes\t\t%llu\n",
 		   stats->os_lockless_reads);
-	seq_printf(seq, "lockless_truncate\t\t"LPU64"\n",
-		   stats->os_lockless_truncates);
 	return 0;
 }
 
@@ -780,26 +860,91 @@ static ssize_t osc_stats_seq_write(struct file *file,
 				   const char __user *buf,
                                    size_t len, loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct obd_device *dev = seq->private;
-        struct osc_stats *stats = &obd2osc_dev(dev)->od_stats;
+	struct seq_file *seq = file->private_data;
+	struct obd_device *obd = seq->private;
+	struct osc_stats *stats = &obd2osc_dev(obd)->osc_stats;
+
+	memset(stats, 0, sizeof(*stats));
+	stats->os_init = ktime_get_real();
 
-        memset(stats, 0, sizeof(*stats));
-        return len;
+	return len;
 }
 
 LPROC_SEQ_FOPS(osc_stats);
 
-int lproc_osc_attach_seqstat(struct obd_device *dev)
+static int lprocfs_osc_attach_seqstat(struct obd_device *obd)
 {
 	int rc;
 
-	rc = lprocfs_seq_create(dev->obd_proc_entry, "osc_stats", 0644,
-				&osc_stats_fops, dev);
+	rc = lprocfs_seq_create(obd->obd_proc_entry, "osc_stats", 0644,
+				&osc_stats_fops, obd);
 	if (rc == 0)
-		rc = lprocfs_obd_seq_create(dev, "rpc_stats", 0644,
-					    &osc_rpc_stats_fops, dev);
+		rc = lprocfs_obd_seq_create(obd, "rpc_stats", 0644,
+					    &osc_rpc_stats_fops, obd);
+
+	return rc;
+}
+#endif /* CONFIG_PROC_FS */
+
+LUSTRE_OBD_UINT_PARAM_ATTR(at_min);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_max);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_history);
+LUSTRE_OBD_UINT_PARAM_ATTR(ldlm_enqueue_min);
+
+static struct attribute *osc_attrs[] = {
+	&lustre_attr_active.attr,
+	&lustre_attr_enable_page_cache_shrink.attr,
+	&lustre_attr_checksums.attr,
+	&lustre_attr_checksum_dump.attr,
+	&lustre_attr_cur_dirty_bytes.attr,
+	&lustre_attr_cur_lost_grant_bytes.attr,
+	&lustre_attr_cur_dirty_grant_bytes.attr,
+	&lustre_attr_destroys_in_flight.attr,
+	&lustre_attr_grant_shrink_interval.attr,
+	&lustre_attr_max_dirty_mb.attr,
+	&lustre_attr_max_rpcs_in_flight.attr,
+	&lustre_attr_short_io_bytes.attr,
+	&lustre_attr_resend_count.attr,
+	&lustre_attr_ost_conn_uuid.attr,
+	&lustre_attr_conn_uuid.attr,
+	&lustre_attr_ping.attr,
+	&lustre_attr_idle_timeout.attr,
+	&lustre_attr_idle_connect.attr,
+	&lustre_attr_grant_shrink.attr,
+	&lustre_attr_at_max.attr,
+	&lustre_attr_at_min.attr,
+	&lustre_attr_at_history.attr,
+	&lustre_attr_ldlm_enqueue_min.attr,
+	NULL,
+};
+
+KOBJ_ATTRIBUTE_GROUPS(osc); /* creates osc_groups */
+
+int osc_tunables_init(struct obd_device *obd)
+{
+	int rc;
+
+	obd->obd_vars = lprocfs_osc_obd_vars;
+	obd->obd_ktype.default_groups = KOBJ_ATTR_GROUPS(osc);
+	rc = lprocfs_obd_setup(obd, false);
+	if (rc)
+		return rc;
+#ifdef CONFIG_PROC_FS
+	/* If the basic OSC proc tree construction succeeded then
+	 * lets do the rest.
+	 */
+	rc = lprocfs_osc_attach_seqstat(obd);
+	if (rc)
+		goto obd_cleanup;
 
+#endif /* CONFIG_PROC_FS */
+	rc = sptlrpc_lprocfs_cliobd_attach(obd);
+	if (rc)
+		goto obd_cleanup;
+
+	ptlrpc_lprocfs_register_obd(obd);
+obd_cleanup:
+	if (rc)
+		lprocfs_obd_cleanup(obd);
 	return rc;
 }
-#endif /* LPROCFS */