X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flproc_lod.c;h=80c6d445d28897cd337ee8caa710fd7e182a0cd0;hb=c9f3efded4ef5aea926e4c67cfb0859d8592e58a;hp=06dd2eeeda1f2eba99c99598f6deabe5939c0b0c;hpb=4fedbc879571305a0d14a2caa989c8c306efc54c;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lproc_lod.c b/lustre/lod/lproc_lod.c
index 06dd2ee..80c6d44 100644
--- a/lustre/lod/lproc_lod.c
+++ b/lustre/lod/lproc_lod.c
@@ -23,7 +23,7 @@
  * Copyright  2008 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,7 +35,7 @@
 #include <obd_class.h>
 #include <linux/seq_file.h>
 #include "lod_internal.h"
-#include <uapi/linux/lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
 
 /*
  * Notice, all the functions below (except for lod_procfs_init() and
@@ -54,6 +54,80 @@
  * \retval 0		on success
  * \retval negative	error code if failed
  */
+static int lod_dom_stripesize_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *dev = m->private;
+	struct lod_device *lod;
+
+	LASSERT(dev != NULL);
+	lod = lu2lod_dev(dev->obd_lu_dev);
+	seq_printf(m, "%u\n", lod->lod_dom_max_stripesize);
+	return 0;
+}
+
+/**
+ * Set default stripe size.
+ *
+ * \param[in] file	proc file
+ * \param[in] buffer	string containing the maximum number of bytes stored in
+ *			each object before moving to the next object in the
+ *			layout (if any)
+ * \param[in] count	@buffer length
+ * \param[in] off	unused for single entry
+ *
+ * \retval @count	on success
+ * \retval negative	error code if failed
+ */
+static ssize_t
+lod_dom_stripesize_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 *dev = m->private;
+	struct lod_device *lod;
+	s64 val;
+	int rc;
+
+	LASSERT(dev != NULL);
+	lod = lu2lod_dev(dev->obd_lu_dev);
+	rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1');
+	if (rc)
+		return rc;
+	if (val < 0)
+		return -ERANGE;
+
+	/* 1GB is the limit */
+	if (val > (1ULL << 30))
+		return -ERANGE;
+	else if (val > 0) {
+		if (val < LOV_MIN_STRIPE_SIZE) {
+			LCONSOLE_INFO("Increasing provided stripe size to "
+				      "a minimum value %u\n",
+				      LOV_MIN_STRIPE_SIZE);
+			val = LOV_MIN_STRIPE_SIZE;
+		} else if (val & (LOV_MIN_STRIPE_SIZE - 1)) {
+			val &= ~(LOV_MIN_STRIPE_SIZE - 1);
+			LCONSOLE_WARN("Changing provided stripe size to %llu "
+				      "(a multiple of minimum %u)\n",
+				      val, LOV_MIN_STRIPE_SIZE);
+		}
+	}
+
+	lod->lod_dom_max_stripesize = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(lod_dom_stripesize);
+
+/**
+ * Show default stripe size.
+ *
+ * \param[in] m		seq file
+ * \param[in] v		unused for single entry
+ *
+ * \retval 0		on success
+ * \retval negative	error code if failed
+ */
 static int lod_stripesize_seq_show(struct seq_file *m, void *v)
 {
 	struct obd_device *dev = m->private;
@@ -86,7 +160,7 @@ lod_stripesize_seq_write(struct file *file, const char __user *buffer,
 	struct seq_file *m = file->private_data;
 	struct obd_device *dev = m->private;
 	struct lod_device *lod;
-	__s64 val;
+	s64 val;
 	int rc;
 
 	LASSERT(dev != NULL);
@@ -113,16 +187,14 @@ LPROC_SEQ_FOPS(lod_stripesize);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_stripeoffset_seq_show(struct seq_file *m, void *v)
+static ssize_t stripeoffset_show(struct kobject *kobj, struct attribute *attr,
+				 char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%llu\n",
-		   lod->lod_desc.ld_default_stripe_offset);
-	return 0;
+	return sprintf(buf, "%lld\n", lod->lod_desc.ld_default_stripe_offset);
 }
 
 /**
@@ -139,29 +211,27 @@ static int lod_stripeoffset_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code if failed
  */
-static ssize_t
-lod_stripeoffset_seq_write(struct file *file, const char __user *buffer,
-			   size_t count, loff_t *off)
+static ssize_t stripeoffset_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
-	__s64 val;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
+	long val;
 	int rc;
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1');
+	rc = kstrtol(buffer, 0, &val);
 	if (rc)
 		return rc;
-	if (val < 0)
+
+	if (val < -1 || val > LOV_MAX_STRIPE_COUNT)
 		return -ERANGE;
 
 	lod->lod_desc.ld_default_stripe_offset = val;
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_stripeoffset);
+LUSTRE_RW_ATTR(stripeoffset);
 
 /**
  * Show default striping pattern (LOV_PATTERN_*).
@@ -172,15 +242,14 @@ LPROC_SEQ_FOPS(lod_stripeoffset);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_stripetype_seq_show(struct seq_file *m, void *v)
+static ssize_t stripetype_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%u\n", lod->lod_desc.ld_pattern);
-	return 0;
+	return sprintf(buf, "%u\n", lod->lod_desc.ld_pattern);
 }
 
 /**
@@ -195,32 +264,25 @@ static int lod_stripetype_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code if failed
  */
-static ssize_t
-lod_stripetype_seq_write(struct file *file, const char __user *buffer,
-			 size_t count, loff_t *off)
+static ssize_t stripetype_store(struct kobject *kobj, struct attribute *attr,
+				const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
+	u32 pattern;
 	int rc;
-	__u32 pattern;
-	__s64 val;
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &pattern);
 	if (rc)
 		return rc;
-	if (val < 0)
-		return -ERANGE;
 
-	pattern = val;
 	lod_fix_desc_pattern(&pattern);
 	lod->lod_desc.ld_pattern = pattern;
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_stripetype);
+LUSTRE_RW_ATTR(stripetype);
 
 /**
  * Show default number of stripes.
@@ -231,16 +293,15 @@ LPROC_SEQ_FOPS(lod_stripetype);
  * \retval 0		on success,
  * \retval negative	error code if failed
  */
-static int lod_stripecount_seq_show(struct seq_file *m, void *v)
+static ssize_t stripecount_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%d\n",
-		   (__s16)(lod->lod_desc.ld_default_stripe_count + 1) - 1);
-	return 0;
+	return sprintf(buf, "%d\n",
+		       (s16)(lod->lod_desc.ld_default_stripe_count + 1) - 1);
 }
 
 /**
@@ -255,32 +316,28 @@ static int lod_stripecount_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code otherwise
  */
-static ssize_t
-lod_stripecount_seq_write(struct file *file, const char __user *buffer,
-			  size_t count, loff_t *off)
+static ssize_t stripecount_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
+	int stripe_count;
 	int rc;
-	__s64 val;
-	__u32 stripe_count;
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtoint(buffer, 0, &stripe_count);
 	if (rc)
 		return rc;
-	if (val < 0)
+
+	if (stripe_count < -1)
 		return -ERANGE;
 
-	stripe_count = val;
 	lod_fix_desc_stripe_count(&stripe_count);
 	lod->lod_desc.ld_default_stripe_count = stripe_count;
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_stripecount);
+LUSTRE_RW_ATTR(stripecount);
 
 /**
  * Show number of targets.
@@ -291,17 +348,16 @@ LPROC_SEQ_FOPS(lod_stripecount);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_numobd_seq_show(struct seq_file *m, void *v)
+static ssize_t numobd_show(struct kobject *kobj, struct attribute *attr,
+			   char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%u\n", lod->lod_desc.ld_tgt_count);
-	return 0;
+	return sprintf(buf, "%u\n", lod->lod_desc.ld_tgt_count);
 }
-LPROC_SEQ_FOPS_RO(lod_numobd);
+LUSTRE_RO_ATTR(numobd);
 
 /**
  * Show number of active targets.
@@ -312,17 +368,16 @@ LPROC_SEQ_FOPS_RO(lod_numobd);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_activeobd_seq_show(struct seq_file *m, void *v)
+static ssize_t activeobd_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%u\n", lod->lod_desc.ld_active_tgt_count);
-	return 0;
+	return sprintf(buf, "%u\n", lod->lod_desc.ld_active_tgt_count);
 }
-LPROC_SEQ_FOPS_RO(lod_activeobd);
+LUSTRE_RO_ATTR(activeobd);
 
 /**
  * Show UUID of LOD device.
@@ -333,17 +388,16 @@ LPROC_SEQ_FOPS_RO(lod_activeobd);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_desc_uuid_seq_show(struct seq_file *m, void *v)
+static ssize_t desc_uuid_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod  = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%s\n", lod->lod_desc.ld_uuid.uuid);
-	return 0;
+	return sprintf(buf, "%s\n", lod->lod_desc.ld_uuid.uuid);
 }
-LPROC_SEQ_FOPS_RO(lod_desc_uuid);
+LUSTRE_RO_ATTR(desc_uuid);
 
 /**
  * Show QoS priority parameter.
@@ -359,15 +413,15 @@ LPROC_SEQ_FOPS_RO(lod_desc_uuid);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_qos_priofree_seq_show(struct seq_file *m, void *v)
+static ssize_t qos_prio_free_show(struct kobject *kobj, struct attribute *attr,
+				  char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod = lu2lod_dev(dev->obd_lu_dev);
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(lod != NULL);
-	seq_printf(m, "%d%%\n",
-		   (lod->lod_qos.lq_prio_free * 100 + 255) >> 8);
-	return 0;
+	return sprintf(buf, "%d%%\n",
+		       (lod->lod_qos.lq_prio_free * 100 + 255) >> 8);
 }
 
 /**
@@ -386,24 +440,20 @@ static int lod_qos_priofree_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code if failed
  */
-static ssize_t
-lod_qos_priofree_seq_write(struct file *file, const char __user *buffer,
-			   size_t count, loff_t *off)
+static ssize_t qos_prio_free_store(struct kobject *kobj, struct attribute *attr,
+				   const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
+	unsigned int val;
 	int rc;
-	__s64 val;
-
-	LASSERT(dev != NULL);
-	lod = lu2lod_dev(dev->obd_lu_dev);
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		return rc;
 
-	if (val < 0 || val > 100)
+	if (val > 100)
 		return -EINVAL;
 	lod->lod_qos.lq_prio_free = (val << 8) / 100;
 	lod->lod_qos.lq_dirty = 1;
@@ -411,7 +461,7 @@ lod_qos_priofree_seq_write(struct file *file, const char __user *buffer,
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_qos_priofree);
+LUSTRE_RW_ATTR(qos_prio_free);
 
 /**
  * Show threshold for "same space on all OSTs" rule.
@@ -488,15 +538,14 @@ LPROC_SEQ_FOPS(lod_qos_thresholdrr);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_qos_maxage_seq_show(struct seq_file *m, void *v)
+static ssize_t qos_maxage_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod = lu2lod_dev(dev->obd_lu_dev);
-	seq_printf(m, "%u Sec\n", lod->lod_desc.ld_qos_maxage);
-	return 0;
+	return sprintf(buf, "%u Sec\n", lod->lod_desc.ld_qos_maxage);
 }
 
 /**
@@ -510,25 +559,21 @@ static int lod_qos_maxage_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code if failed
  */
-static ssize_t
-lod_qos_maxage_seq_write(struct file *file, const char __user *buffer,
-			 size_t count, loff_t *off)
+static ssize_t qos_maxage_store(struct kobject *kobj, struct attribute *attr,
+				const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 	struct lustre_cfg_bufs bufs;
-	struct lod_device *lod;
 	struct lu_device *next;
 	struct lustre_cfg *lcfg;
 	char str[32];
 	unsigned int i;
 	int rc;
-	__s64 val;
-
-	LASSERT(dev != NULL);
-	lod = lu2lod_dev(dev->obd_lu_dev);
+	u32 val;
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		return rc;
 
@@ -540,7 +585,7 @@ lod_qos_maxage_seq_write(struct file *file, const char __user *buffer,
 	 * propogate the value down to OSPs
 	 */
 	lustre_cfg_bufs_reset(&bufs, NULL);
-	snprintf(str, 32, "%smaxage=%u", PARAM_OSP, (__u32)val);
+	snprintf(str, 32, "%smaxage=%u", PARAM_OSP, val);
 	lustre_cfg_bufs_set_string(&bufs, 1, str);
 	OBD_ALLOC(lcfg, lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen));
 	if (lcfg == NULL)
@@ -559,7 +604,7 @@ lod_qos_maxage_seq_write(struct file *file, const char __user *buffer,
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_qos_maxage);
+LUSTRE_RW_ATTR(qos_maxage);
 
 static void *lod_osts_seq_start(struct seq_file *p, loff_t *pos)
 {
@@ -669,15 +714,6 @@ static int lod_osts_seq_open(struct inode *inode, struct file *file)
 	return 0;
 }
 
-LPROC_SEQ_FOPS_RO_TYPE(lod, uuid);
-
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_blksize);
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_kbytestotal);
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_kbytesfree);
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_kbytesavail);
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_filestotal);
-LPROC_SEQ_FOPS_RO_TYPE(lod, dt_filesfree);
-
 /**
  * Show whether special failout mode for testing is enabled or not.
  *
@@ -687,16 +723,14 @@ LPROC_SEQ_FOPS_RO_TYPE(lod, dt_filesfree);
  * \retval 0		on success
  * \retval negative	error code if failed
  */
-static int lod_lmv_failout_seq_show(struct seq_file *m, void *v)
+static ssize_t lmv_failout_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
 {
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
 
-	LASSERT(dev != NULL);
-	lod = lu2lod_dev(dev->obd_lu_dev);
-
-	seq_printf(m, "%d\n", lod->lod_lmv_failout ? 1 : 0);
-	return 0;
+	return sprintf(buf, "%d\n", lod->lod_lmv_failout ? 1 : 0);
 }
 
 /**
@@ -714,67 +748,35 @@ static int lod_lmv_failout_seq_show(struct seq_file *m, void *v)
  * \retval @count	on success
  * \retval negative	error code if failed
  */
-static ssize_t
-lod_lmv_failout_seq_write(struct file *file, const char __user *buffer,
-			  size_t count, loff_t *off)
+static ssize_t lmv_failout_store(struct kobject *kobj, struct attribute *attr,
+				 const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *dev = m->private;
-	struct lod_device *lod;
-	__s64 val = 0;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lod_device *lod = dt2lod_dev(dt);
+	bool val = 0;
 	int rc;
 
-	LASSERT(dev != NULL);
-	lod = lu2lod_dev(dev->obd_lu_dev);
-
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtobool(buffer, &val);
 	if (rc)
 		return rc;
 
-	lod->lod_lmv_failout = !!val;
+	lod->lod_lmv_failout = val;
 
 	return count;
 }
-LPROC_SEQ_FOPS(lod_lmv_failout);
+LUSTRE_RW_ATTR(lmv_failout);
 
 static struct lprocfs_vars lprocfs_lod_obd_vars[] = {
-	{ .name	=	"uuid",
-	  .fops	=	&lod_uuid_fops		},
 	{ .name	=	"stripesize",
 	  .fops	=	&lod_stripesize_fops	},
-	{ .name	=	"stripeoffset",
-	  .fops	=	&lod_stripeoffset_fops	},
-	{ .name	=	"stripecount",
-	  .fops	=	&lod_stripecount_fops	},
-	{ .name	=	"stripetype",
-	  .fops	=	&lod_stripetype_fops	},
-	{ .name	=	"numobd",
-	  .fops	=	&lod_numobd_fops	},
-	{ .name	=	"activeobd",
-	  .fops	=	&lod_activeobd_fops	},
-	{ .name	=	"desc_uuid",
-	  .fops	=	&lod_desc_uuid_fops	},
-	{ .name	=	"qos_prio_free",
-	  .fops	=	&lod_qos_priofree_fops	},
 	{ .name	=	"qos_threshold_rr",
 	  .fops	=	&lod_qos_thresholdrr_fops },
-	{ .name	=	"qos_maxage",
-	  .fops	=	&lod_qos_maxage_fops	},
-	{ .name	=	"lmv_failout",
-	  .fops	=	&lod_lmv_failout_fops	},
+	{ .name =	"dom_stripesize",
+	  .fops =	&lod_dom_stripesize_fops	},
 	{ NULL }
 };
 
-static struct lprocfs_vars lprocfs_lod_osd_vars[] = {
-	{ .name = "blocksize",	 .fops = &lod_dt_blksize_fops },
-	{ .name = "kbytestotal", .fops = &lod_dt_kbytestotal_fops },
-	{ .name = "kbytesfree",	 .fops = &lod_dt_kbytesfree_fops },
-	{ .name = "kbytesavail", .fops = &lod_dt_kbytesavail_fops },
-	{ .name = "filestotal",	 .fops = &lod_dt_filestotal_fops },
-	{ .name = "filesfree",	 .fops = &lod_dt_filesfree_fops },
-	{ .name = NULL }
-};
-
 static const struct file_operations lod_proc_target_fops = {
 	.owner   = THIS_MODULE,
 	.open    = lod_osts_seq_open,
@@ -783,6 +785,19 @@ static const struct file_operations lod_proc_target_fops = {
 	.release = lprocfs_seq_release,
 };
 
+static struct attribute *lod_attrs[] = {
+	&lustre_attr_stripeoffset.attr,
+	&lustre_attr_stripecount.attr,
+	&lustre_attr_stripetype.attr,
+	&lustre_attr_activeobd.attr,
+	&lustre_attr_desc_uuid.attr,
+	&lustre_attr_lmv_failout.attr,
+	&lustre_attr_numobd.attr,
+	&lustre_attr_qos_maxage.attr,
+	&lustre_attr_qos_prio_free.attr,
+	NULL,
+};
+
 /**
  * Initialize procfs entries for LOD.
  *
@@ -793,23 +808,28 @@ static const struct file_operations lod_proc_target_fops = {
  */
 int lod_procfs_init(struct lod_device *lod)
 {
-	struct obd_device	*obd = lod2obd(lod);
-	struct proc_dir_entry	*lov_proc_dir = NULL;
-	struct obd_type		*type;
-	int			 rc;
+	struct obd_device *obd = lod2obd(lod);
+	struct proc_dir_entry *lov_proc_dir;
+	struct obd_type *type;
+	struct kobject *lov;
+	int rc;
 
-	obd->obd_vars = lprocfs_lod_obd_vars;
-	rc = lprocfs_obd_setup(obd);
+	lod->lod_dt_dev.dd_ktype.default_attrs = lod_attrs;
+	rc = dt_tunables_init(&lod->lod_dt_dev, obd->obd_type, obd->obd_name,
+			      NULL);
 	if (rc) {
-		CERROR("%s: cannot setup procfs entry: %d\n",
+		CERROR("%s: failed to setup DT tunables: %d\n",
 		       obd->obd_name, rc);
 		RETURN(rc);
 	}
 
-	rc = lprocfs_add_vars(obd->obd_proc_entry, lprocfs_lod_osd_vars,
-			      &lod->lod_dt_dev);
-	if (rc) {
-		CERROR("%s: cannot setup procfs entry: %d\n",
+	obd->obd_vars = lprocfs_lod_obd_vars;
+	obd->obd_proc_entry = lprocfs_register(obd->obd_name,
+					       obd->obd_type->typ_procroot,
+					       obd->obd_vars, obd);
+	if (IS_ERR(obd->obd_proc_entry)) {
+		rc = PTR_ERR(obd->obd_proc_entry);
+		CERROR("%s: error %d setting up lprocfs\n",
 		       obd->obd_name, rc);
 		GOTO(out, rc);
 	}
@@ -833,6 +853,19 @@ int lod_procfs_init(struct lod_device *lod)
 		GOTO(out, rc);
 	}
 
+	lov = kset_find_obj(lustre_kset, "lov");
+	if (lov) {
+		rc = sysfs_create_link(lov, &lod->lod_dt_dev.dd_kobj,
+				       obd->obd_name);
+		kobject_put(lov);
+	}
+
+	lod->lod_debugfs = ldebugfs_add_symlink(obd->obd_name, "lov",
+						"../lod/%s", obd->obd_name);
+	if (!lod->lod_debugfs)
+		CERROR("%s: failed to create LOV debugfs symlink\n",
+		       obd->obd_name);
+
 	/* If the real LOV is present which is the case for setups
 	 * with both server and clients on the same node then use
 	 * the LOV's proc root */
@@ -854,7 +887,7 @@ int lod_procfs_init(struct lod_device *lod)
 	RETURN(0);
 
 out:
-	lprocfs_obd_cleanup(obd);
+	dt_tunables_fini(&lod->lod_dt_dev);
 
 	return rc;
 }
@@ -867,18 +900,28 @@ out:
 void lod_procfs_fini(struct lod_device *lod)
 {
 	struct obd_device *obd = lod2obd(lod);
+	struct kobject *lov;
 
 	if (lod->lod_symlink != NULL) {
 		lprocfs_remove(&lod->lod_symlink);
 		lod->lod_symlink = NULL;
 	}
 
-	if (lod->lod_pool_proc_entry != NULL) {
-		lprocfs_remove(&lod->lod_pool_proc_entry);
-		lod->lod_pool_proc_entry = NULL;
+	lov = kset_find_obj(lustre_kset, "lov");
+	if (lov) {
+		sysfs_remove_link(lov, obd->obd_name);
+		kobject_put(lov);
+	}
+
+	if (!IS_ERR_OR_NULL(lod->lod_debugfs))
+		ldebugfs_remove(&lod->lod_debugfs);
+
+	if (obd->obd_proc_entry) {
+		lprocfs_remove(&obd->obd_proc_entry);
+		obd->obd_proc_entry = NULL;
 	}
 
-	lprocfs_obd_cleanup(obd);
+	dt_tunables_fini(&lod->lod_dt_dev);
 }
 
 #endif /* CONFIG_PROC_FS */