X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status.c;h=aa2925ab820d3d30e721af3d67a0f64a5bbe3c03;hp=86a0a0182826c6718bd834f6953cc515deb787e6;hb=5d085745af43bd15e6b7ea728491600411833b2a;hpb=2728de4db8c0f8177202e2ffcad74a1893b210c9

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 86a0a01..aa2925a 100644
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -49,16 +49,39 @@ MODULE_PARM_DESC(lprocfs_no_percpu_stats, "Do not alloc percpu data for lprocfs
 
 int lprocfs_single_release(struct inode *inode, struct file *file)
 {
-        return single_release(inode, file);
+	return single_release(inode, file);
 }
 EXPORT_SYMBOL(lprocfs_single_release);
 
 int lprocfs_seq_release(struct inode *inode, struct file *file)
 {
-        return seq_release(inode, file);
+	return seq_release(inode, file);
 }
 EXPORT_SYMBOL(lprocfs_seq_release);
 
+struct dentry *ldebugfs_add_simple(struct dentry *root,
+				   char *name, void *data,
+				   const struct file_operations *fops)
+{
+	struct dentry *entry;
+	umode_t mode = 0;
+
+	if (!root || !name || !fops)
+		return ERR_PTR(-EINVAL);
+
+	if (fops->read)
+		mode = 0444;
+	if (fops->write)
+		mode |= 0200;
+	entry = debugfs_create_file(name, mode, root, data, fops);
+	if (IS_ERR_OR_NULL(entry)) {
+		CERROR("LprocFS: No memory to create <debugfs> entry %s", name);
+		return entry ?: ERR_PTR(-ENOMEM);
+	}
+	return entry;
+}
+EXPORT_SYMBOL(ldebugfs_add_simple);
+
 struct proc_dir_entry *
 lprocfs_add_simple(struct proc_dir_entry *root, char *name,
 		   void *data, const struct file_operations *fops)
@@ -66,8 +89,8 @@ lprocfs_add_simple(struct proc_dir_entry *root, char *name,
 	struct proc_dir_entry *proc;
 	mode_t mode = 0;
 
-	if (root == NULL || name == NULL || fops == NULL)
-                return ERR_PTR(-EINVAL);
+	if (!root || !name || !fops)
+		return ERR_PTR(-EINVAL);
 
 	if (fops->read)
 		mode = 0444;
@@ -79,35 +102,36 @@ lprocfs_add_simple(struct proc_dir_entry *root, char *name,
 		       name);
 		return ERR_PTR(-ENOMEM);
 	}
-        return proc;
+	return proc;
 }
 EXPORT_SYMBOL(lprocfs_add_simple);
 
 struct proc_dir_entry *lprocfs_add_symlink(const char *name,
-                        struct proc_dir_entry *parent, const char *format, ...)
+					   struct proc_dir_entry *parent,
+					   const char *format, ...)
 {
-        struct proc_dir_entry *entry;
-        char *dest;
-        va_list ap;
+	struct proc_dir_entry *entry;
+	char *dest;
+	va_list ap;
 
-        if (parent == NULL || format == NULL)
-                return NULL;
+	if (!parent || !format)
+		return NULL;
 
-        OBD_ALLOC_WAIT(dest, MAX_STRING_SIZE + 1);
-        if (dest == NULL)
-                return NULL;
+	OBD_ALLOC_WAIT(dest, MAX_STRING_SIZE + 1);
+	if (!dest)
+		return NULL;
 
-        va_start(ap, format);
-        vsnprintf(dest, MAX_STRING_SIZE, format, ap);
-        va_end(ap);
+	va_start(ap, format);
+	vsnprintf(dest, MAX_STRING_SIZE, format, ap);
+	va_end(ap);
 
-        entry = proc_symlink(name, parent, dest);
-	if (entry == NULL)
+	entry = proc_symlink(name, parent, dest);
+	if (!entry)
 		CERROR("LprocFS: Could not create symbolic link from "
 		       "%s to %s\n", name, dest);
 
-        OBD_FREE(dest, MAX_STRING_SIZE + 1);
-        return entry;
+	OBD_FREE(dest, MAX_STRING_SIZE + 1);
+	return entry;
 }
 EXPORT_SYMBOL(lprocfs_add_symlink);
 
@@ -157,10 +181,10 @@ int
 lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
 		 void *data)
 {
-	if (root == NULL || list == NULL)
+	if (!root || !list)
 		return -EINVAL;
 
-	while (list->name != NULL) {
+	while (list->name) {
 		struct proc_dir_entry *proc;
 		mode_t mode = 0;
 
@@ -175,7 +199,7 @@ lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
 		proc = proc_create_data(list->name, mode, root,
 					list->fops ?: &lprocfs_generic_fops,
 					list->data ?: data);
-		if (proc == NULL)
+		if (!proc)
 			return -ENOMEM;
 		list++;
 	}
@@ -203,36 +227,38 @@ static void lprocfs_remove_nolock(struct proc_dir_entry **proot)
 	struct proc_dir_entry *parent;
 
 	*proot = NULL;
-	if (root == NULL || IS_ERR(root))
+	if (!root || IS_ERR(root))
 		return;
 
-        parent = root->parent;
-        LASSERT(parent != NULL);
+	parent = root->parent;
+	LASSERT(parent != NULL);
 
-        while (1) {
-                while (temp->subdir != NULL)
-                        temp = temp->subdir;
+	while (1) {
+		while (temp->subdir)
+			temp = temp->subdir;
 
-                rm_entry = temp;
-                temp = temp->parent;
+		rm_entry = temp;
+		temp = temp->parent;
 
-                /* Memory corruption once caused this to fail, and
-                   without this LASSERT we would loop here forever. */
-                LASSERTF(strlen(rm_entry->name) == rm_entry->namelen,
-                         "0x%p  %s/%s len %d\n", rm_entry, temp->name,
-                         rm_entry->name, (int)strlen(rm_entry->name));
+		/*
+		 * Memory corruption once caused this to fail, and
+		 * without this LASSERT we would loop here forever.
+		 */
+		LASSERTF(strlen(rm_entry->name) == rm_entry->namelen,
+			 "0x%p  %s/%s len %d\n", rm_entry, temp->name,
+			 rm_entry->name, (int)strlen(rm_entry->name));
 
-                remove_proc_entry(rm_entry->name, temp);
-                if (temp == parent)
-                        break;
-        }
+		remove_proc_entry(rm_entry->name, temp);
+		if (temp == parent)
+			break;
+	}
 }
 
 int remove_proc_subtree(const char *name, struct proc_dir_entry *parent)
 {
-	struct proc_dir_entry	 *t = NULL;
-	struct proc_dir_entry	**p;
-	int			  len, busy = 0;
+	struct proc_dir_entry *t = NULL;
+	struct proc_dir_entry **p;
+	int len, busy = 0;
 
 	LASSERT(parent != NULL);
 	len = strlen(name);
@@ -331,10 +357,10 @@ lprocfs_register(const char *name, struct proc_dir_entry *parent,
 	struct proc_dir_entry *newchild;
 
 	newchild = proc_mkdir(name, parent);
-	if (newchild == NULL)
+	if (!newchild)
 		return ERR_PTR(-ENOMEM);
 
-	if (list != NULL) {
+	if (list) {
 		int rc = lprocfs_add_vars(newchild, list, data);
 		if (rc) {
 			lprocfs_remove(&newchild);
@@ -346,93 +372,6 @@ lprocfs_register(const char *name, struct proc_dir_entry *parent,
 EXPORT_SYMBOL(lprocfs_register);
 
 /* Generic callbacks */
-int lprocfs_uint_seq_show(struct seq_file *m, void *data)
-{
-	seq_printf(m, "%u\n", *(unsigned int *)data);
-	return 0;
-}
-EXPORT_SYMBOL(lprocfs_uint_seq_show);
-
-int lprocfs_wr_uint(struct file *file, const char __user *buffer,
-                    unsigned long count, void *data)
-{
-	unsigned	*p = data;
-	char		 dummy[MAX_STRING_SIZE + 1];
-	char		*end;
-	unsigned long	 tmp;
-
-	if (count >= sizeof(dummy))
-		return -EINVAL;
-
-	if (count == 0)
-		return 0;
-
-	if (copy_from_user(dummy, buffer, count))
-		return -EFAULT;
-
-	dummy[count] = 0;
-
-	tmp = simple_strtoul(dummy, &end, 0);
-	if (dummy == end)
-		return -EINVAL;
-
-	*p = (unsigned int)tmp;
-	return count;
-}
-EXPORT_SYMBOL(lprocfs_wr_uint);
-
-ssize_t lprocfs_uint_seq_write(struct file *file, const char __user *buffer,
-			       size_t count, loff_t *off)
-{
-	int *data = ((struct seq_file *)file->private_data)->private;
-	int rc;
-	__s64 val = 0;
-
-	rc = lprocfs_str_to_s64(buffer, count, &val);
-	if (rc < 0)
-		return rc;
-
-	return lprocfs_wr_uint(file, buffer, count, data);
-}
-EXPORT_SYMBOL(lprocfs_uint_seq_write);
-
-int lprocfs_u64_seq_show(struct seq_file *m, void *data)
-{
-	LASSERT(data != NULL);
-	seq_printf(m, "%llu\n", *(__u64 *)data);
-	return 0;
-}
-EXPORT_SYMBOL(lprocfs_u64_seq_show);
-
-int lprocfs_atomic_seq_show(struct seq_file *m, void *data)
-{
-	atomic_t *atom = data;
-	LASSERT(atom != NULL);
-	seq_printf(m, "%d\n", atomic_read(atom));
-	return 0;
-}
-EXPORT_SYMBOL(lprocfs_atomic_seq_show);
-
-ssize_t
-lprocfs_atomic_seq_write(struct file *file, const char __user *buffer,
-			size_t count, loff_t *off)
-{
-	atomic_t *atm = ((struct seq_file *)file->private_data)->private;
-	__s64 val = 0;
-	int rc;
-
-	rc = lprocfs_str_to_s64(buffer, count, &val);
-	if (rc < 0)
-		return rc;
-
-	if (val <= 0 || val > INT_MAX)
-		return -ERANGE;
-
-	atomic_set(atm, val);
-	return count;
-}
-EXPORT_SYMBOL(lprocfs_atomic_seq_write);
-
 int lprocfs_uuid_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = data;
@@ -453,16 +392,6 @@ static ssize_t uuid_show(struct kobject *kobj, struct attribute *attr,
 }
 LUSTRE_RO_ATTR(uuid);
 
-int lprocfs_name_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *dev = data;
-
-	LASSERT(dev != NULL);
-	seq_printf(m, "%s\n", dev->obd_name);
-	return 0;
-}
-EXPORT_SYMBOL(lprocfs_name_seq_show);
-
 static ssize_t blocksize_show(struct kobject *kobj, struct attribute *attr,
 			      char *buf)
 {
@@ -592,6 +521,25 @@ static ssize_t filesfree_show(struct kobject *kobj, struct attribute *attr,
 }
 LUSTRE_RO_ATTR(filesfree);
 
+ssize_t conn_uuid_show(struct kobject *kobj, struct attribute *attr, char *buf)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct ptlrpc_connection *conn;
+	ssize_t count;
+
+	LPROCFS_CLIMP_CHECK(obd);
+	conn = obd->u.cli.cl_import->imp_connection;
+	if (conn && obd->u.cli.cl_import)
+		count = sprintf(buf, "%s\n", conn->c_remote_uuid.uuid);
+	else
+		count = sprintf(buf, "%s\n", "<none>");
+
+	LPROCFS_CLIMP_EXIT(obd);
+	return count;
+}
+EXPORT_SYMBOL(conn_uuid_show);
+
 int lprocfs_server_uuid_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = data;
@@ -611,26 +559,6 @@ int lprocfs_server_uuid_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_server_uuid_seq_show);
 
-int lprocfs_conn_uuid_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = data;
-	struct ptlrpc_connection *conn;
-	int rc = 0;
-
-	LASSERT(obd != NULL);
-
-	LPROCFS_CLIMP_CHECK(obd);
-	conn = obd->u.cli.cl_import->imp_connection;
-	if (conn && obd->u.cli.cl_import)
-		seq_printf(m, "%s\n", conn->c_remote_uuid.uuid);
-	else
-		seq_printf(m, "%s\n", "<none>");
-
-	LPROCFS_CLIMP_EXIT(obd);
-	return rc;
-}
-EXPORT_SYMBOL(lprocfs_conn_uuid_seq_show);
-
 /** add up per-cpu counters */
 
 /**
@@ -724,14 +652,14 @@ void lprocfs_stats_unlock(struct lprocfs_stats *stats,
 void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx,
 			   struct lprocfs_counter *cnt)
 {
-	unsigned int			num_entry;
-	struct lprocfs_counter		*percpu_cntr;
-	int				i;
-	unsigned long			flags = 0;
+	unsigned int num_entry;
+	struct lprocfs_counter *percpu_cntr;
+	int i;
+	unsigned long flags = 0;
 
 	memset(cnt, 0, sizeof(*cnt));
 
-	if (stats == NULL) {
+	if (!stats) {
 		/* set count to 1 to avoid divide-by-zero errs in callers */
 		cnt->lc_count = 1;
 		return;
@@ -742,7 +670,7 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx,
 	num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
 
 	for (i = 0; i < num_entry; i++) {
-		if (stats->ls_percpu[i] == NULL)
+		if (!stats->ls_percpu[i])
 			continue;
 		percpu_cntr = lprocfs_stats_counter_get(stats, i, idx);
 
@@ -758,16 +686,6 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx,
 	lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags);
 }
 
-/**
- * Append a space separated list of current set flags to str.
- */
-#define flag2str(flag)						\
-	do {								\
-		if (imp->imp_##flag) {					\
-			seq_printf(m, "%s" #flag, first ? "" : ", ");	\
-			first = false;					\
-		}							\
-	} while (0)
 static void obd_import_flags2str(struct obd_import *imp, struct seq_file *m)
 {
 	bool first = true;
@@ -777,18 +695,16 @@ static void obd_import_flags2str(struct obd_import *imp, struct seq_file *m)
 		first = false;
 	}
 
-	flag2str(invalid);
-	flag2str(deactive);
-	flag2str(replayable);
-	flag2str(delayed_recovery);
-	flag2str(vbr_failed);
-	flag2str(pingable);
-	flag2str(resend_replay);
-	flag2str(no_pinger_recover);
-	flag2str(need_mne_swab);
-	flag2str(connect_tried);
+	flag2str(imp, invalid);
+	flag2str(imp, deactive);
+	flag2str(imp, replayable);
+	flag2str(imp, delayed_recovery);
+	flag2str(imp, vbr_failed);
+	flag2str(imp, pingable);
+	flag2str(imp, resend_replay);
+	flag2str(imp, no_pinger_recover);
+	flag2str(imp, connect_tried);
 }
-#undef flag2str
 
 static const char *obd_connect_names[] = {
 	/* flags names  */
@@ -857,13 +773,25 @@ static const char *obd_connect_names[] = {
 	"compact_obdo",
 	"second_flags",
 	/* flags2 names */
-	"file_secctx",
-	"lockaheadv2",
+	"file_secctx",	/* 0x01 */
+	"lockaheadv2",	/* 0x02 */
+	"dir_migrate",	/* 0x04 */
+	"sum_statfs",	/* 0x08 */
+	"overstriping",	/* 0x10 */
+	"flr",		/* 0x20 */
+	"wbc",		/* 0x40 */
+	"lock_convert",  /* 0x80 */
+	"archive_id_array",	/* 0x100 */
+	"unknown",		/* 0x200 */
+	"selinux_policy",	/* 0x400 */
+	"lsom",			/* 0x800 */
+	"pcc",			/* 0x1000 */
+	"plain_layout",		/* 0x2000 */
 	NULL
 };
 
-static void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags,
-				      __u64 flags2, const char *sep)
+void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags, __u64 flags2,
+			       const char *sep)
 {
 	bool first = true;
 	__u64 mask;
@@ -900,6 +828,7 @@ static void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags,
 		first = false;
 	}
 }
+EXPORT_SYMBOL(obd_connect_seq_flags2str);
 
 int obd_connect_flags2str(char *page, int count, __u64 flags, __u64 flags2,
 			  const char *sep)
@@ -936,8 +865,8 @@ int obd_connect_flags2str(char *page, int count, __u64 flags, __u64 flags2,
 }
 EXPORT_SYMBOL(obd_connect_flags2str);
 
-static void obd_connect_data_seqprint(struct seq_file *m,
-				      struct obd_connect_data *ocd)
+void
+obd_connect_data_seqprint(struct seq_file *m, struct obd_connect_data *ocd)
 {
 	__u64 flags;
 
@@ -993,16 +922,16 @@ static void obd_connect_data_seqprint(struct seq_file *m,
 
 int lprocfs_import_seq_show(struct seq_file *m, void *data)
 {
-	char				nidstr[LNET_NIDSTR_SIZE];
-	struct lprocfs_counter          ret;
-	struct lprocfs_counter_header   *header;
-	struct obd_device               *obd    = (struct obd_device *)data;
-	struct obd_import               *imp;
-	struct obd_import_conn          *conn;
-	struct obd_connect_data		*ocd;
-	int                             j;
-	int                             k;
-	int                             rw      = 0;
+	char nidstr[LNET_NIDSTR_SIZE];
+	struct lprocfs_counter ret;
+	struct lprocfs_counter_header *header;
+	struct obd_device *obd = (struct obd_device *)data;
+	struct obd_import *imp;
+	struct obd_import_conn *conn;
+	struct obd_connect_data *ocd;
+	int j;
+	int k;
+	int rw = 0;
 
 	LASSERT(obd != NULL);
 	LPROCFS_CLIMP_CHECK(obd);
@@ -1036,7 +965,7 @@ int lprocfs_import_seq_show(struct seq_file *m, void *data)
 		seq_printf(m, "%s%s", j ? ", " : "", nidstr);
 		j++;
 	}
-	if (imp->imp_connection != NULL)
+	if (imp->imp_connection)
 		libcfs_nid2str_r(imp->imp_connection->c_peer.nid,
 				 nidstr, sizeof(nidstr));
 	else
@@ -1045,14 +974,16 @@ int lprocfs_import_seq_show(struct seq_file *m, void *data)
 		   "       current_connection: %s\n"
 		   "       connection_attempts: %u\n"
 		   "       generation: %u\n"
-		   "       in-progress_invalidations: %u\n",
+		   "       in-progress_invalidations: %u\n"
+		   "       idle: %lld sec\n",
 		   nidstr,
 		   imp->imp_conn_cnt,
 		   imp->imp_generation,
-		   atomic_read(&imp->imp_inval_count));
+		   atomic_read(&imp->imp_inval_count),
+		   ktime_get_real_seconds() - imp->imp_last_reply_time);
 	spin_unlock(&imp->imp_lock);
 
-	if (obd->obd_svc_stats == NULL)
+	if (!obd->obd_svc_stats)
 		goto out_climp;
 
 	header = &obd->obd_svc_stats->ls_cnt_header[PTLRPC_REQWAIT_CNTR];
@@ -1234,12 +1165,12 @@ int lprocfs_connect_flags_seq_show(struct seq_file *m, void *data)
 }
 EXPORT_SYMBOL(lprocfs_connect_flags_seq_show);
 
-static struct attribute *obd_def_uuid_attrs[] = {
+static const struct attribute *obd_def_uuid_attrs[] = {
 	&lustre_attr_uuid.attr,
 	NULL,
 };
 
-static struct attribute *obd_def_attrs[] = {
+static const struct attribute *obd_def_attrs[] = {
 	&lustre_attr_blocksize.attr,
 	&lustre_attr_kbytestotal.attr,
 	&lustre_attr_kbytesfree.attr,
@@ -1260,6 +1191,7 @@ static void obd_sysfs_release(struct kobject *kobj)
 
 int lprocfs_obd_setup(struct obd_device *obd, bool uuid_only)
 {
+	struct lprocfs_vars *debugfs_vars = NULL;
 	int rc;
 
 	if (!obd || obd->obd_magic != OBD_DEVICE_MAGIC)
@@ -1271,10 +1203,8 @@ int lprocfs_obd_setup(struct obd_device *obd, bool uuid_only)
 
 	obd->obd_ktype.sysfs_ops = &lustre_sysfs_ops;
 	obd->obd_ktype.release = obd_sysfs_release;
-	if (obd->obd_attrs)
-		obd->obd_ktype.default_attrs = obd->obd_attrs;
 
-	obd->obd_kset.kobj.parent = &obd->obd_type->typ_kobj;
+	obd->obd_kset.kobj.parent = obd->obd_type->typ_kobj;
 	obd->obd_kset.kobj.ktype = &obd->obd_ktype;
 	init_completion(&obd->obd_kobj_unregister);
 	rc = kset_register(&obd->obd_kset);
@@ -1282,20 +1212,36 @@ int lprocfs_obd_setup(struct obd_device *obd, bool uuid_only)
 		return rc;
 
 	if (uuid_only)
-		obd->obd_attrs_group.attrs = obd_def_uuid_attrs;
+		obd->obd_attrs = obd_def_uuid_attrs;
 	else
-		obd->obd_attrs_group.attrs = obd_def_attrs;
+		obd->obd_attrs = obd_def_attrs;
 
-	rc = sysfs_create_group(&obd->obd_kset.kobj, &obd->obd_attrs_group);
+	rc = sysfs_create_files(&obd->obd_kset.kobj, obd->obd_attrs);
 	if (rc) {
 		kset_unregister(&obd->obd_kset);
 		return rc;
 	}
 
-	if (obd->obd_proc_entry)
-		GOTO(already_registered, rc);
+	if (!obd->obd_type->typ_procroot)
+		debugfs_vars = obd->obd_vars;
+	obd->obd_debugfs_entry = ldebugfs_register(obd->obd_name,
+						   obd->obd_type->typ_debugfs_entry,
+						   debugfs_vars, obd);
+	if (IS_ERR_OR_NULL(obd->obd_debugfs_entry)) {
+		rc = obd->obd_debugfs_entry ? PTR_ERR(obd->obd_debugfs_entry)
+					    : -ENOMEM;
+		CERROR("error %d setting up debugfs for %s\n",
+		       rc, obd->obd_name);
+		obd->obd_debugfs_entry = NULL;
+
+		sysfs_remove_files(&obd->obd_kset.kobj, obd->obd_attrs);
+		obd->obd_attrs = NULL;
+		kset_unregister(&obd->obd_kset);
+		return rc;
+	}
 
-	LASSERT(obd->obd_type->typ_procroot != NULL);
+	if (obd->obd_proc_entry || !obd->obd_type->typ_procroot)
+		GOTO(already_registered, rc);
 
 	obd->obd_proc_entry = lprocfs_register(obd->obd_name,
 					       obd->obd_type->typ_procroot,
@@ -1304,7 +1250,12 @@ int lprocfs_obd_setup(struct obd_device *obd, bool uuid_only)
 		rc = PTR_ERR(obd->obd_proc_entry);
 		CERROR("error %d setting up lprocfs for %s\n",rc,obd->obd_name);
 		obd->obd_proc_entry = NULL;
-		lprocfs_obd_cleanup(obd);
+
+		ldebugfs_remove(&obd->obd_debugfs_entry);
+		sysfs_remove_files(&obd->obd_kset.kobj, obd->obd_attrs);
+		obd->obd_attrs = NULL;
+		kset_unregister(&obd->obd_kset);
+		return rc;
 	}
 already_registered:
 	return rc;
@@ -1327,28 +1278,38 @@ int lprocfs_obd_cleanup(struct obd_device *obd)
 		obd->obd_proc_entry = NULL;
 	}
 
-	sysfs_remove_group(&obd->obd_kset.kobj, &obd->obd_attrs_group);
+	if (!IS_ERR_OR_NULL(obd->obd_debugfs_entry))
+		ldebugfs_remove(&obd->obd_debugfs_entry);
+
+	/* obd device never allocated a kset */
+	if (!obd->obd_kset.kobj.state_initialized)
+		return 0;
+
+	if (obd->obd_attrs) {
+		sysfs_remove_files(&obd->obd_kset.kobj, obd->obd_attrs);
+		obd->obd_attrs = NULL;
+	}
+
 	kset_unregister(&obd->obd_kset);
 	wait_for_completion(&obd->obd_kobj_unregister);
-
 	return 0;
 }
 EXPORT_SYMBOL(lprocfs_obd_cleanup);
 
 int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid)
 {
-	struct lprocfs_counter  *cntr;
-	unsigned int            percpusize;
-	int                     rc = -ENOMEM;
-	unsigned long           flags = 0;
-	int                     i;
+	struct lprocfs_counter *cntr;
+	unsigned int percpusize;
+	int rc = -ENOMEM;
+	unsigned long flags = 0;
+	int i;
 
 	LASSERT(stats->ls_percpu[cpuid] == NULL);
 	LASSERT((stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) == 0);
 
 	percpusize = lprocfs_stats_counter_size(stats);
 	LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[cpuid], percpusize);
-	if (stats->ls_percpu[cpuid] != NULL) {
+	if (stats->ls_percpu[cpuid]) {
 		rc = 0;
 		if (unlikely(stats->ls_biggest_alloc_num <= cpuid)) {
 			if (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE)
@@ -1375,16 +1336,16 @@ int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid)
 struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num,
                                           enum lprocfs_stats_flags flags)
 {
-	struct lprocfs_stats	*stats;
-	unsigned int		num_entry;
-	unsigned int		percpusize = 0;
-	int			i;
+	struct lprocfs_stats *stats;
+	unsigned int num_entry;
+	unsigned int percpusize = 0;
+	int i;
 
-        if (num == 0)
-                return NULL;
+	if (num == 0)
+		return NULL;
 
-        if (lprocfs_no_percpu_stats != 0)
-                flags |= LPROCFS_STATS_FLAG_NOPERCPU;
+	if (lprocfs_no_percpu_stats != 0)
+		flags |= LPROCFS_STATS_FLAG_NOPERCPU;
 
 	if (flags & LPROCFS_STATS_FLAG_NOPERCPU)
 		num_entry = 1;
@@ -1393,7 +1354,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num,
 
 	/* alloc percpu pointers for all possible cpu slots */
 	LIBCFS_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_entry]));
-	if (stats == NULL)
+	if (!stats)
 		return NULL;
 
 	stats->ls_num = num;
@@ -1403,14 +1364,14 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num,
 	/* alloc num of counter headers */
 	LIBCFS_ALLOC(stats->ls_cnt_header,
 		     stats->ls_num * sizeof(struct lprocfs_counter_header));
-	if (stats->ls_cnt_header == NULL)
+	if (!stats->ls_cnt_header)
 		goto fail;
 
 	if ((flags & LPROCFS_STATS_FLAG_NOPERCPU) != 0) {
 		/* contains only one set counters */
 		percpusize = lprocfs_stats_counter_size(stats);
 		LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[0], percpusize);
-		if (stats->ls_percpu[0] == NULL)
+		if (!stats->ls_percpu[0])
 			goto fail;
 		stats->ls_biggest_alloc_num = 1;
 	} else if ((flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0) {
@@ -1435,9 +1396,9 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh)
 	unsigned int percpusize;
 	unsigned int i;
 
-        if (stats == NULL || stats->ls_num == 0)
-                return;
-        *statsh = NULL;
+	if (!stats || stats->ls_num == 0)
+		return;
+	*statsh = NULL;
 
 	if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU)
 		num_entry = 1;
@@ -1446,9 +1407,9 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh)
 
 	percpusize = lprocfs_stats_counter_size(stats);
 	for (i = 0; i < num_entry; i++)
-		if (stats->ls_percpu[i] != NULL)
+		if (stats->ls_percpu[i])
 			LIBCFS_FREE(stats->ls_percpu[i], percpusize);
-	if (stats->ls_cnt_header != NULL)
+	if (stats->ls_cnt_header)
 		LIBCFS_FREE(stats->ls_cnt_header, stats->ls_num *
 					sizeof(struct lprocfs_counter_header));
 	LIBCFS_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_entry]));
@@ -1483,16 +1444,16 @@ EXPORT_SYMBOL(lprocfs_stats_collector);
 
 void lprocfs_clear_stats(struct lprocfs_stats *stats)
 {
-	struct lprocfs_counter		*percpu_cntr;
-	int				i;
-	int				j;
-	unsigned int			num_entry;
-	unsigned long			flags = 0;
+	struct lprocfs_counter *percpu_cntr;
+	int i;
+	int j;
+	unsigned int num_entry;
+	unsigned long flags = 0;
 
 	num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
 
 	for (i = 0; i < num_entry; i++) {
-		if (stats->ls_percpu[i] == NULL)
+		if (!stats->ls_percpu[i])
 			continue;
 		for (j = 0; j < stats->ls_num; j++) {
 			percpu_cntr = lprocfs_stats_counter_get(stats, i, j);
@@ -1514,12 +1475,12 @@ static ssize_t lprocfs_stats_seq_write(struct file *file,
 				       const char __user *buf,
 				       size_t len, loff_t *off)
 {
-        struct seq_file *seq = file->private_data;
-        struct lprocfs_stats *stats = seq->private;
+	struct seq_file *seq = file->private_data;
+	struct lprocfs_stats *stats = seq->private;
 
-        lprocfs_clear_stats(stats);
+	lprocfs_clear_stats(stats);
 
-        return len;
+	return len;
 }
 
 static void *lprocfs_stats_seq_start(struct seq_file *p, loff_t *pos)
@@ -1543,10 +1504,10 @@ static void *lprocfs_stats_seq_next(struct seq_file *p, void *v, loff_t *pos)
 /* seq file export of one lprocfs counter */
 static int lprocfs_stats_seq_show(struct seq_file *p, void *v)
 {
-	struct lprocfs_stats		*stats	= p->private;
-	struct lprocfs_counter_header	*hdr;
-	struct lprocfs_counter		 ctr;
-	int				 idx	= *(loff_t *)v;
+	struct lprocfs_stats *stats = p->private;
+	struct lprocfs_counter_header *hdr;
+	struct lprocfs_counter ctr;
+	int idx = *(loff_t *)v;
 
 	if (idx == 0) {
 		struct timespec64 now;
@@ -1595,17 +1556,17 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file)
 	if (rc)
 		return rc;
 	seq = file->private_data;
-	seq->private = inode->i_private ? : PDE_DATA(inode);
+	seq->private = inode->i_private ? inode->i_private : PDE_DATA(inode);
 	return 0;
 }
 
 static const struct file_operations lprocfs_stats_seq_fops = {
-        .owner   = THIS_MODULE,
-        .open    = lprocfs_stats_seq_open,
-        .read    = seq_read,
-        .write   = lprocfs_stats_seq_write,
-        .llseek  = seq_lseek,
-        .release = lprocfs_seq_release,
+	.owner   = THIS_MODULE,
+	.open    = lprocfs_stats_seq_open,
+	.read    = seq_read,
+	.write   = lprocfs_stats_seq_write,
+	.llseek  = seq_lseek,
+	.release = lprocfs_seq_release,
 };
 
 int ldebugfs_register_stats(struct dentry *parent, const char *name,
@@ -1632,7 +1593,7 @@ int lprocfs_register_stats(struct proc_dir_entry *root, const char *name,
 
 	entry = proc_create_data(name, 0644, root,
 				 &lprocfs_stats_seq_fops, stats);
-	if (entry == NULL)
+	if (!entry)
 		return -ENOMEM;
 	return 0;
 }
@@ -1641,11 +1602,11 @@ EXPORT_SYMBOL(lprocfs_register_stats);
 void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
 			  unsigned conf, const char *name, const char *units)
 {
-	struct lprocfs_counter_header	*header;
-	struct lprocfs_counter		*percpu_cntr;
-	unsigned long			flags = 0;
-	unsigned int			i;
-	unsigned int			num_cpu;
+	struct lprocfs_counter_header *header;
+	struct lprocfs_counter *percpu_cntr;
+	unsigned long flags = 0;
+	unsigned int i;
+	unsigned int num_cpu;
 
 	LASSERT(stats != NULL);
 
@@ -1659,7 +1620,7 @@ void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
 
 	num_cpu = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
 	for (i = 0; i < num_cpu; ++i) {
-		if (stats->ls_percpu[i] == NULL)
+		if (!stats->ls_percpu[i])
 			continue;
 		percpu_cntr = lprocfs_stats_counter_get(stats, i, index);
 		percpu_cntr->lc_count		= 0;
@@ -1674,49 +1635,23 @@ void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
 }
 EXPORT_SYMBOL(lprocfs_counter_init);
 
-/* Note that we only init md counters for ops whose offset is less
- * than NUM_MD_STATS. This is explained in a comment in the definition
- * of struct md_ops. */
-#define LPROCFS_MD_OP_INIT(base, stats, op)				       \
-	do {								       \
-		unsigned int _idx = base + MD_COUNTER_OFFSET(op);	       \
-									       \
-		if (MD_COUNTER_OFFSET(op) < NUM_MD_STATS) {		       \
-			LASSERT(_idx < stats->ls_num);			       \
-			lprocfs_counter_init(stats, _idx, 0, #op, "reqs");     \
-		}							       \
-	} while (0)
-
-void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats)
-{
-	LPROCFS_MD_OP_INIT(num_private_stats, stats, get_root);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, null_inode);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, close);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, create);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, enqueue);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, getattr);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, getattr_name);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_lock);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, link);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, rename);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, setattr);
-	LPROCFS_MD_OP_INIT(num_private_stats, stats, fsync);
-	LPROCFS_MD_OP_INIT(num_private_stats, stats, read_page);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, unlink);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, setxattr);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, getxattr);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, init_ea_size);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, get_lustre_md);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, free_lustre_md);
-	LPROCFS_MD_OP_INIT(num_private_stats, stats, merge_attr);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, set_open_replay_data);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, clear_open_replay_data);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, set_lock_data);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, lock_match);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, cancel_unused);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_getattr_async);
-        LPROCFS_MD_OP_INIT(num_private_stats, stats, revalidate_lock);
-}
+static const char * const mps_stats[] = {
+	[LPROC_MD_CLOSE]		= "close",
+	[LPROC_MD_CREATE]		= "create",
+	[LPROC_MD_ENQUEUE]		= "enqueue",
+	[LPROC_MD_GETATTR]		= "getattr",
+	[LPROC_MD_INTENT_LOCK]		= "intent_lock",
+	[LPROC_MD_LINK]			= "link",
+	[LPROC_MD_RENAME]		= "rename",
+	[LPROC_MD_SETATTR]		= "setattr",
+	[LPROC_MD_FSYNC]		= "fsync",
+	[LPROC_MD_READ_PAGE]		= "read_page",
+	[LPROC_MD_UNLINK]		= "unlink",
+	[LPROC_MD_SETXATTR]		= "setxattr",
+	[LPROC_MD_GETXATTR]		= "getxattr",
+	[LPROC_MD_INTENT_GETATTR_ASYNC]	= "intent_getattr_async",
+	[LPROC_MD_REVALIDATE_LOCK]	= "revalidate_lock",
+};
 
 int lprocfs_alloc_md_stats(struct obd_device *obd,
 			   unsigned int num_private_stats)
@@ -1725,11 +1660,8 @@ int lprocfs_alloc_md_stats(struct obd_device *obd,
 	unsigned int num_stats;
 	int rc, i;
 
-	CLASSERT(offsetof(struct md_ops, MD_STATS_FIRST_OP) == 0);
-	CLASSERT(_MD_COUNTER_OFFSET(MD_STATS_FIRST_OP) == 0);
-	CLASSERT(_MD_COUNTER_OFFSET(MD_STATS_LAST_OP) > 0);
-
-	/* TODO Ensure that this function is only used where
+	/*
+	 * TODO Ensure that this function is only used where
 	 * appropriate by adding an assertion to the effect that
 	 * obd->obd_type->typ_md_ops is not NULL. We can't do this now
 	 * because mdt_procfs_init() uses this function to allocate
@@ -1739,20 +1671,17 @@ int lprocfs_alloc_md_stats(struct obd_device *obd,
 	 */
 	LASSERT(obd->obd_proc_entry != NULL);
 	LASSERT(obd->obd_md_stats == NULL);
-	LASSERT(obd->obd_md_cntr_base == 0);
 
-	num_stats = NUM_MD_STATS + num_private_stats;
+	num_stats = ARRAY_SIZE(mps_stats) + num_private_stats;
 	stats = lprocfs_alloc_stats(num_stats, 0);
-	if (stats == NULL)
+	if (!stats)
 		return -ENOMEM;
 
-	lprocfs_init_mps_stats(num_private_stats, stats);
-
-	for (i = num_private_stats; i < num_stats; i++) {
-		if (stats->ls_cnt_header[i].lc_name == NULL) {
-			CERROR("Missing md_stat initializer md_op "
-			       "operation at offset %d. Aborting.\n",
-			       i - num_private_stats);
+	for (i = 0; i < ARRAY_SIZE(mps_stats); i++) {
+		lprocfs_counter_init(stats, i, 0, mps_stats[i], "reqs");
+		if (!stats->ls_cnt_header[i].lc_name) {
+			CERROR("Missing md_stat initializer md_op operation at offset %d. Aborting.\n",
+			       i);
 			LBUG();
 		}
 	}
@@ -1762,7 +1691,6 @@ int lprocfs_alloc_md_stats(struct obd_device *obd,
 		lprocfs_free_stats(&stats);
 	} else {
 		obd->obd_md_stats = stats;
-		obd->obd_md_cntr_base = num_private_stats;
 	}
 
 	return rc;
@@ -1773,9 +1701,8 @@ void lprocfs_free_md_stats(struct obd_device *obd)
 {
 	struct lprocfs_stats *stats = obd->obd_md_stats;
 
-	if (stats != NULL) {
+	if (stats) {
 		obd->obd_md_stats = NULL;
-		obd->obd_md_cntr_base = 0;
 		lprocfs_free_stats(&stats);
 	}
 }
@@ -1783,24 +1710,24 @@ EXPORT_SYMBOL(lprocfs_free_md_stats);
 
 void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats)
 {
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_ENQUEUE - LDLM_FIRST_OPC,
-                             0, "ldlm_enqueue", "reqs");
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_CONVERT - LDLM_FIRST_OPC,
-                             0, "ldlm_convert", "reqs");
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_CANCEL - LDLM_FIRST_OPC,
-                             0, "ldlm_cancel", "reqs");
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_BL_CALLBACK - LDLM_FIRST_OPC,
-                             0, "ldlm_bl_callback", "reqs");
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_CP_CALLBACK - LDLM_FIRST_OPC,
-                             0, "ldlm_cp_callback", "reqs");
-        lprocfs_counter_init(ldlm_stats,
-                             LDLM_GL_CALLBACK - LDLM_FIRST_OPC,
-                             0, "ldlm_gl_callback", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_ENQUEUE - LDLM_FIRST_OPC,
+			     0, "ldlm_enqueue", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_CONVERT - LDLM_FIRST_OPC,
+			     0, "ldlm_convert", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_CANCEL - LDLM_FIRST_OPC,
+			     0, "ldlm_cancel", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_BL_CALLBACK - LDLM_FIRST_OPC,
+			     0, "ldlm_bl_callback", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_CP_CALLBACK - LDLM_FIRST_OPC,
+			     0, "ldlm_cp_callback", "reqs");
+	lprocfs_counter_init(ldlm_stats,
+			     LDLM_GL_CALLBACK - LDLM_FIRST_OPC,
+			     0, "ldlm_gl_callback", "reqs");
 }
 EXPORT_SYMBOL(lprocfs_init_ldlm_stats);
 
@@ -1811,7 +1738,7 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc,
 {
 	__s64 ret = 0;
 
-	if (lc == NULL || header == NULL)
+	if (!lc || !header)
 		RETURN(0);
 
 	switch (field) {
@@ -1848,55 +1775,55 @@ EXPORT_SYMBOL(lprocfs_read_helper);
 int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val,
                              int mult)
 {
-        long decimal_val, frac_val;
-        int prtn;
-
-        if (count < 10)
-                return -EINVAL;
-
-        decimal_val = val / mult;
-        prtn = snprintf(buffer, count, "%ld", decimal_val);
-        frac_val = val % mult;
-
-        if (prtn < (count - 4) && frac_val > 0) {
-                long temp_frac;
-                int i, temp_mult = 1, frac_bits = 0;
-
-                temp_frac = frac_val * 10;
-                buffer[prtn++] = '.';
-                while (frac_bits < 2 && (temp_frac / mult) < 1 ) {
-                        /* only reserved 2 bits fraction */
-                        buffer[prtn++] ='0';
-                        temp_frac *= 10;
-                        frac_bits++;
-                }
-                /*
-                 * Need to think these cases :
-                 *      1. #echo x.00 > /proc/xxx       output result : x
-                 *      2. #echo x.0x > /proc/xxx       output result : x.0x
-                 *      3. #echo x.x0 > /proc/xxx       output result : x.x
-                 *      4. #echo x.xx > /proc/xxx       output result : x.xx
-                 *      Only reserved 2 bits fraction.
-                 */
-                for (i = 0; i < (5 - prtn); i++)
-                        temp_mult *= 10;
-
-                frac_bits = min((int)count - prtn, 3 - frac_bits);
-                prtn += snprintf(buffer + prtn, frac_bits, "%ld",
-                                 frac_val * temp_mult / mult);
-
-                prtn--;
-                while(buffer[prtn] < '1' || buffer[prtn] > '9') {
-                        prtn--;
-                        if (buffer[prtn] == '.') {
-                                prtn--;
-                                break;
-                        }
-                }
-                prtn++;
-        }
-        buffer[prtn++] ='\n';
-        return prtn;
+	long decimal_val, frac_val;
+	int prtn;
+
+	if (count < 10)
+		return -EINVAL;
+
+	decimal_val = val / mult;
+	prtn = snprintf(buffer, count, "%ld", decimal_val);
+	frac_val = val % mult;
+
+	if (prtn < (count - 4) && frac_val > 0) {
+		long temp_frac;
+		int i, temp_mult = 1, frac_bits = 0;
+
+		temp_frac = frac_val * 10;
+		buffer[prtn++] = '.';
+		while (frac_bits < 2 && (temp_frac / mult) < 1) {
+			/* only reserved 2 bits fraction */
+			buffer[prtn++] = '0';
+			temp_frac *= 10;
+			frac_bits++;
+		}
+		/*
+		 * Need to think these cases :
+		 *      1. #echo x.00 > /proc/xxx       output result : x
+		 *      2. #echo x.0x > /proc/xxx       output result : x.0x
+		 *      3. #echo x.x0 > /proc/xxx       output result : x.x
+		 *      4. #echo x.xx > /proc/xxx       output result : x.xx
+		 *      Only reserved 2 bits fraction.
+		 */
+		for (i = 0; i < (5 - prtn); i++)
+			temp_mult *= 10;
+
+		frac_bits = min((int)count - prtn, 3 - frac_bits);
+		prtn += snprintf(buffer + prtn, frac_bits, "%ld",
+				 frac_val * temp_mult / mult);
+
+		prtn--;
+		while (buffer[prtn] < '1' || buffer[prtn] > '9') {
+			prtn--;
+			if (buffer[prtn] == '.') {
+				prtn--;
+				break;
+			}
+		}
+		prtn++;
+	}
+	buffer[prtn++] = '\n';
+	return prtn;
 }
 EXPORT_SYMBOL(lprocfs_read_frac_helper);
 
@@ -2088,7 +2015,7 @@ static int str_to_u64_parse(char *buffer, unsigned long count,
 	}
 
 	/* the multiplier limits how large the value can be */
-	wrap_indicator /=  mult;
+	wrap_indicator = div64_u64(wrap_indicator, mult);
 
 	if (strwhole) {
 		rc = kstrtoull(strwhole, base, &whole);
@@ -2180,26 +2107,6 @@ static int str_to_s64_internal(const char __user *buffer, unsigned long count,
 
 /**
  * Convert a user string into a signed 64 bit number. This function produces
- * an error when the value parsed from the string underflows or
- * overflows. This function accepts strings which contain digits and
- * optionally a decimal or hex strings which are prefixed with "0x".
- *
- * \param[in] buffer	string consisting of numbers and optionally a decimal
- * \param[in] count	buffer length
- * \param[in] val	if successful, the value represented by the string
- *
- * \retval		0 on success
- * \retval		negative number on error
- */
-int lprocfs_str_to_s64(const char __user *buffer, unsigned long count,
-		       __s64 *val)
-{
-	return str_to_s64_internal(buffer, count, val, 1, false);
-}
-EXPORT_SYMBOL(lprocfs_str_to_s64);
-
-/**
- * Convert a user string into a signed 64 bit number. This function produces
  * an error when the value parsed from the string times multiplier underflows or
  * overflows. This function only accepts strings that contains digits, an
  * optional decimal, and a char representing a unit at the end. If a unit is
@@ -2231,7 +2138,7 @@ int lprocfs_str_with_units_to_s64(const char __user *buffer,
 }
 EXPORT_SYMBOL(lprocfs_str_with_units_to_s64);
 
-static char *lprocfs_strnstr(const char *s1, const char *s2, size_t len)
+char *lprocfs_strnstr(const char *s1, const char *s2, size_t len)
 {
 	size_t l2;
 
@@ -2246,6 +2153,7 @@ static char *lprocfs_strnstr(const char *s1, const char *s2, size_t len)
 	}
 	return NULL;
 }
+EXPORT_SYMBOL(lprocfs_strnstr);
 
 /**
  * Find the string \a name in the input \a buffer, and return a pointer to the
@@ -2260,7 +2168,7 @@ char *lprocfs_find_named_value(const char *buffer, const char *name,
 
 	/* there is no strnstr() in rhel5 and ubuntu kernels */
 	val = lprocfs_strnstr(buffer, name, buflen);
-	if (val == NULL)
+	if (!val)
 		return (char *)buffer;
 
 	val += strlen(name);                             /* skip prefix */
@@ -2307,7 +2215,7 @@ int lprocfs_seq_create(struct proc_dir_entry *parent,
 
 	entry = proc_create_data(name, mode, parent, seq_fops, data);
 
-	if (entry == NULL)
+	if (!entry)
 		RETURN(-ENOMEM);
 
 	RETURN(0);
@@ -2349,12 +2257,12 @@ EXPORT_SYMBOL(lprocfs_oh_tally_log2);
 
 unsigned long lprocfs_oh_sum(struct obd_histogram *oh)
 {
-        unsigned long ret = 0;
-        int i;
+	unsigned long ret = 0;
+	int i;
 
-        for (i = 0; i < OBD_HIST_MAX; i++)
-                ret +=  oh->oh_buckets[i];
-        return ret;
+	for (i = 0; i < OBD_HIST_MAX; i++)
+		ret +=  oh->oh_buckets[i];
+	return ret;
 }
 EXPORT_SYMBOL(lprocfs_oh_sum);
 
@@ -2411,7 +2319,7 @@ ssize_t lprocfs_obd_max_pages_per_rpc_seq_write(struct file *file,
 	struct client_obd *cli = &dev->u.cli;
 	struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data;
 	int chunk_mask, rc;
-	__s64 val;
+	s64 val;
 
 	rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1');
 	if (rc)
@@ -2443,39 +2351,40 @@ ssize_t lprocfs_obd_max_pages_per_rpc_seq_write(struct file *file,
 }
 EXPORT_SYMBOL(lprocfs_obd_max_pages_per_rpc_seq_write);
 
-int lprocfs_obd_short_io_bytes_seq_show(struct seq_file *m, void *data)
+ssize_t short_io_bytes_show(struct kobject *kobj, struct attribute *attr,
+			    char *buf)
 {
-	struct obd_device *dev = data;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 	struct client_obd *cli = &dev->u.cli;
+	int rc;
 
 	spin_lock(&cli->cl_loi_list_lock);
-	seq_printf(m, "%d\n", cli->cl_short_io_bytes);
+	rc = sprintf(buf, "%d\n", cli->cl_max_short_io_bytes);
 	spin_unlock(&cli->cl_loi_list_lock);
-	return 0;
+	return rc;
 }
-EXPORT_SYMBOL(lprocfs_obd_short_io_bytes_seq_show);
-
+EXPORT_SYMBOL(short_io_bytes_show);
 
 /* Used to catch people who think they're specifying pages. */
-#define MIN_SHORT_IO_BYTES 64
+#define MIN_SHORT_IO_BYTES 64U
 
-ssize_t lprocfs_obd_short_io_bytes_seq_write(struct file *file,
-					     const char __user *buffer,
-					     size_t count, loff_t *off)
+ssize_t short_io_bytes_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 obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 	struct client_obd *cli = &dev->u.cli;
+	u32 val;
 	int rc;
-	__u64 val;
 
 	LPROCFS_CLIMP_CHECK(dev);
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		GOTO(out, rc);
 
-	if (val > OBD_MAX_SHORT_IO_BYTES || val < MIN_SHORT_IO_BYTES)
+	if (val && (val < MIN_SHORT_IO_BYTES || val > OBD_MAX_SHORT_IO_BYTES))
 		GOTO(out, rc = -ERANGE);
 
 	rc = count;
@@ -2484,14 +2393,14 @@ ssize_t lprocfs_obd_short_io_bytes_seq_write(struct file *file,
 	if (val > (cli->cl_max_pages_per_rpc << PAGE_SHIFT))
 		rc = -ERANGE;
 	else
-		cli->cl_short_io_bytes = val;
+		cli->cl_max_short_io_bytes = val;
 	spin_unlock(&cli->cl_loi_list_lock);
 
 out:
 	LPROCFS_CLIMP_EXIT(dev);
 	return rc;
 }
-EXPORT_SYMBOL(lprocfs_obd_short_io_bytes_seq_write);
+EXPORT_SYMBOL(short_io_bytes_store);
 
 int lprocfs_wr_root_squash(const char __user *buffer, unsigned long count,
 			   struct root_squash_info *squash, char *name)
@@ -2513,7 +2422,7 @@ int lprocfs_wr_root_squash(const char __user *buffer, unsigned long count,
 
 	/* look for uid gid separator */
 	tmp = strchr(kernbuf, ':');
-	if (tmp == NULL) {
+	if (!tmp) {
 		errmsg = "needs uid:gid format";
 		GOTO(failed, rc = -EINVAL);
 	}
@@ -2540,7 +2449,7 @@ int lprocfs_wr_root_squash(const char __user *buffer, unsigned long count,
 	RETURN(count);
 
 failed:
-	if (tmp != NULL) {
+	if (tmp) {
 		tmp--;
 		*tmp = ':';
 	}
@@ -2571,7 +2480,7 @@ int lprocfs_wr_nosquash_nids(const char __user *buffer, unsigned long count,
 	}
 
 	OBD_ALLOC(kernbuf, count + 1);
-	if (kernbuf == NULL) {
+	if (!kernbuf) {
 		errmsg = "no memory";
 		GOTO(failed, rc = -ENOMEM);
 	}