X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status_server.c;h=7808d09b19ee531561cd42d609f532c476488783;hp=c603bff7700d3048b2025720c24f5f6015691202;hb=6dd0be19a97945db5da61ecdf845087b936805fa;hpb=3b5fc14da24a5c78346c2f42ea61b51c1d8c6191

diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c
index c603bff..7808d09b 100644
--- a/lustre/obdclass/lprocfs_status_server.c
+++ b/lustre/obdclass/lprocfs_status_server.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2014, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,12 +38,13 @@
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
+#include <lustre_nodemap.h>
 
-#if defined(LPROCFS)
+#ifdef CONFIG_PROC_FS
 
 int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 {
-	struct obd_device *obd = PDE_DATA(f->f_dentry->d_inode);
+	struct obd_device *obd = PDE_DATA(file_inode(f));
 
 	atomic_inc(&obd->obd_evict_inprogress);
 	return 0;
@@ -51,7 +52,7 @@ int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 
 int lprocfs_evict_client_release(struct inode *inode, struct file *f)
 {
-	struct obd_device *obd = PDE_DATA(f->f_dentry->d_inode);
+	struct obd_device *obd = PDE_DATA(file_inode(f));
 
 	atomic_dec(&obd->obd_evict_inprogress);
 	wake_up(&obd->obd_evict_inprogress_waitq);
@@ -62,7 +63,7 @@ int lprocfs_evict_client_release(struct inode *inode, struct file *f)
 #define BUFLEN (UUID_MAX + 5)
 
 ssize_t
-lprocfs_evict_client_seq_write(struct file *file, const char *buffer,
+lprocfs_evict_client_seq_write(struct file *file, const char __user *buffer,
 			       size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
@@ -108,7 +109,8 @@ int lprocfs_num_exports_seq_show(struct seq_file *m, void *data)
 	struct obd_device *obd = data;
 
 	LASSERT(obd != NULL);
-	return seq_printf(m, "%u\n", obd->obd_num_exports);
+	seq_printf(m, "%u\n", obd->obd_num_exports);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
 
@@ -136,7 +138,7 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat)
 
 void lprocfs_free_per_client_stats(struct obd_device *obd)
 {
-	cfs_hash_t *hash = obd->obd_nid_stats_hash;
+	struct cfs_hash *hash = obd->obd_nid_stats_hash;
 	struct nid_stat *stat;
 	ENTRY;
 
@@ -153,26 +155,44 @@ void lprocfs_free_per_client_stats(struct obd_device *obd)
 }
 EXPORT_SYMBOL(lprocfs_free_per_client_stats);
 
-int lprocfs_exp_nid_seq_show(struct seq_file *m, void *data)
+static int
+lprocfs_exp_print_uuid_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+			   struct hlist_node *hnode, void *cb_data)
 {
-	struct obd_export *exp = m->private;
-	LASSERT(exp != NULL);
-	return seq_printf(m, "%s\n", obd_export_nid2str(exp));
-}
+	struct seq_file *m = cb_data;
+	struct obd_export *exp = cfs_hash_object(hs, hnode);
 
-int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-				struct hlist_node *hnode, void *cb_data)
+	if (exp->exp_nid_stats != NULL)
+		seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
+	return 0;
+}
 
+static int
+lprocfs_exp_print_nodemap_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+			      struct hlist_node *hnode, void *cb_data)
 {
-	struct obd_export *exp = cfs_hash_object(hs, hnode);
 	struct seq_file *m = cb_data;
+	struct obd_export *exp = cfs_hash_object(hs, hnode);
+	struct lu_nodemap *nodemap = exp->exp_target_data.ted_nodemap;
 
-	if (exp->exp_nid_stats)
-		seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
+	if (nodemap != NULL)
+		seq_printf(m, "%s\n", nodemap->nm_name);
+	return 0;
+}
+
+static int
+lprocfs_exp_nodemap_seq_show(struct seq_file *m, void *data)
+{
+	struct nid_stat *stats = m->private;
+	struct obd_device *obd = stats->nid_obd;
+
+	cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
+			      lprocfs_exp_print_nodemap_seq, m);
 	return 0;
 }
+LPROC_SEQ_FOPS_RO(lprocfs_exp_nodemap);
 
-int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
+static int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
 {
 	struct nid_stat *stats = m->private;
 	struct obd_device *obd = stats->nid_obd;
@@ -183,21 +203,22 @@ int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid);
 
-int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-				struct hlist_node *hnode, void *cb_data)
+static int
+lprocfs_exp_print_hash_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+			   struct hlist_node *hnode, void *cb_data)
 
 {
 	struct seq_file *m = cb_data;
 	struct obd_export *exp = cfs_hash_object(hs, hnode);
 
 	if (exp->exp_lock_hash != NULL) {
-		cfs_hash_debug_header_seq(m);
-		cfs_hash_debug_str_seq(hs, m);
+		cfs_hash_debug_header(m);
+		cfs_hash_debug_str(hs, m);
 	}
 	return 0;
 }
 
-int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
+static int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
 {
 	struct nid_stat *stats = m->private;
 	struct obd_device *obd = stats->nid_obd;
@@ -208,10 +229,40 @@ int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_hash);
 
+int lprocfs_exp_print_replydata_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+				    struct hlist_node *hnode, void *cb_data)
+
+{
+	struct obd_export *exp = cfs_hash_object(hs, hnode);
+	struct seq_file *m = cb_data;
+	struct tg_export_data *ted = &exp->exp_target_data;
+
+	seq_printf(m, "reply_cnt: %d\n"
+		   "reply_max: %d\n"
+		   "reply_released_by_xid: %d\n"
+		   "reply_released_by_tag: %d\n\n",
+		   ted->ted_reply_cnt,
+		   ted->ted_reply_max,
+		   ted->ted_release_xid,
+		   ted->ted_release_tag);
+	return 0;
+}
+
+int lprocfs_exp_replydata_seq_show(struct seq_file *m, void *data)
+{
+	struct nid_stat *stats = m->private;
+	struct obd_device *obd = stats->nid_obd;
+
+	cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
+				lprocfs_exp_print_replydata_seq, m);
+	return 0;
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_replydata);
+
 int lprocfs_nid_stats_clear_seq_show(struct seq_file *m, void *data)
 {
-	return seq_printf(m, "%s\n", "Write into this file to clear all nid "
-			  "stats and stale nid entries");
+	seq_puts(m, "Write into this file to clear all nid stats and stale nid entries\n");
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_show);
 
@@ -236,7 +287,7 @@ static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
 }
 
 ssize_t
-lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
+lprocfs_nid_stats_clear_seq_write(struct file *file, const char __user *buffer,
 					size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
@@ -258,17 +309,15 @@ lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
 }
 EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_write);
 
-int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
+int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid)
 {
 	struct nid_stat *new_stat, *old_stat;
 	struct obd_device *obd = NULL;
 	struct proc_dir_entry *entry;
-	char *buffer = NULL;
+	char nidstr[LNET_NIDSTR_SIZE];
 	int rc = 0;
 	ENTRY;
 
-	*newnid = 0;
-
 	if (!exp || !exp->exp_obd || !exp->exp_obd->obd_proc_exports_entry ||
 	    !exp->exp_obd->obd_nid_stats_hash)
 		RETURN(-EINVAL);
@@ -276,8 +325,10 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
 	/* not test against zero because eric say:
 	 * You may only test nid against another nid, or LNET_NID_ANY.
 	 * Anything else is nonsense.*/
-	if (!nid || *nid == LNET_NID_ANY)
-		RETURN(0);
+	if (nid == NULL || *nid == LNET_NID_ANY)
+		RETURN(-EALREADY);
+
+	libcfs_nid2str_r(*nid, nidstr, sizeof(nidstr));
 
 	spin_lock(&exp->exp_lock);
 	if (exp->exp_nid_stats != NULL) {
@@ -294,16 +345,15 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
 	if (new_stat == NULL)
 		RETURN(-ENOMEM);
 
-	new_stat->nid		= *nid;
-	new_stat->nid_obd	= exp->exp_obd;
+	new_stat->nid     = *nid;
+	new_stat->nid_obd = exp->exp_obd;
 	/* we need set default refcount to 1 to balance obd_disconnect */
 	atomic_set(&new_stat->nid_exp_ref_count, 1);
 
 	old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash,
 					   nid, &new_stat->nid_hash);
 	CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n",
-	       old_stat, libcfs_nid2str(*nid),
-	       atomic_read(&new_stat->nid_exp_ref_count));
+	       old_stat, nidstr, atomic_read(&old_stat->nid_exp_ref_count));
 
 	/* Return -EALREADY here so that we know that the /proc
 	 * entry already has been created */
@@ -318,56 +368,61 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
 		GOTO(destroy_new, rc = -EALREADY);
 	}
 	/* not found - create */
-	OBD_ALLOC(buffer, LNET_NIDSTR_SIZE);
-	if (buffer == NULL)
-		GOTO(destroy_new, rc = -ENOMEM);
-
-	memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE);
-#ifndef HAVE_ONLY_PROCFS_SEQ
-	new_stat->nid_proc = lprocfs_register(buffer,
+	new_stat->nid_proc = lprocfs_register(nidstr,
 					      obd->obd_proc_exports_entry,
 					      NULL, NULL);
-#else
-	new_stat->nid_proc = lprocfs_seq_register(buffer,
-						  obd->obd_proc_exports_entry,
-						  NULL, NULL);
-#endif
-	OBD_FREE(buffer, LNET_NIDSTR_SIZE);
 
 	if (IS_ERR(new_stat->nid_proc)) {
 		rc = PTR_ERR(new_stat->nid_proc);
 		new_stat->nid_proc = NULL;
 		CERROR("%s: cannot create proc entry for export %s: rc = %d\n",
-		       obd->obd_name, libcfs_nid2str(*nid), rc);
+		       obd->obd_name, nidstr, rc);
+		GOTO(destroy_new_ns, rc);
+	}
+
+	entry = lprocfs_add_simple(new_stat->nid_proc, "nodemap", new_stat,
+				   &lprocfs_exp_nodemap_fops);
+	if (IS_ERR(entry)) {
+		rc = PTR_ERR(entry);
+		CWARN("Error adding the nodemap file: rc = %d\n", rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
 	entry = lprocfs_add_simple(new_stat->nid_proc, "uuid", new_stat,
 				   &lprocfs_exp_uuid_fops);
 	if (IS_ERR(entry)) {
-		CWARN("Error adding the NID stats file\n");
 		rc = PTR_ERR(entry);
+		CWARN("Error adding the NID stats file: rc = %d\n", rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
 	entry = lprocfs_add_simple(new_stat->nid_proc, "hash", new_stat,
 				   &lprocfs_exp_hash_fops);
 	if (IS_ERR(entry)) {
-		CWARN("Error adding the hash file\n");
 		rc = PTR_ERR(entry);
+		CWARN("Error adding the hash file: rc = %d\n", rc);
+		GOTO(destroy_new_ns, rc);
+	}
+
+	entry = lprocfs_add_simple(new_stat->nid_proc, "reply_data", new_stat,
+				   &lprocfs_exp_replydata_fops);
+	if (IS_ERR(entry)) {
+		rc = PTR_ERR(entry);
+		CWARN("%s: Error adding the reply_data file: rc = %d\n",
+		      obd->obd_name, rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
 	spin_lock(&exp->exp_lock);
 	exp->exp_nid_stats = new_stat;
 	spin_unlock(&exp->exp_lock);
-	*newnid = 1;
+
 	/* protect competitive add to list, not need locking on destroy */
 	spin_lock(&obd->obd_nid_lock);
 	list_add(&new_stat->nid_list, &obd->obd_nid_stats);
 	spin_unlock(&obd->obd_nid_lock);
 
-	RETURN(rc);
+	RETURN(0);
 
 destroy_new_ns:
 	if (new_stat->nid_proc != NULL)
@@ -393,7 +448,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp)
 
 	return 0;
 }
-EXPORT_SYMBOL(lprocfs_exp_cleanup);
 
 #define LPROCFS_OBD_OP_INIT(base, stats, op)			\
 do {								\
@@ -422,27 +476,18 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_alloc);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, create);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr_async);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr_async);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, change_cbdata);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, find_cbdata);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_init);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_uuid);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotacheck);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotactl);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, ping);
 	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_new);
@@ -504,22 +549,22 @@ EXPORT_SYMBOL(lprocfs_free_obd_stats);
 int lprocfs_hash_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = m->private;
-	int c = 0;
 
 	if (obd == NULL)
 		return 0;
 
-	c += cfs_hash_debug_header_seq(m);
-	c += cfs_hash_debug_str_seq(obd->obd_uuid_hash, m);
-	c += cfs_hash_debug_str_seq(obd->obd_nid_hash, m);
-	c += cfs_hash_debug_str_seq(obd->obd_nid_stats_hash, m);
-	return c;
+	cfs_hash_debug_header(m);
+	cfs_hash_debug_str(obd->obd_uuid_hash, m);
+	cfs_hash_debug_str(obd->obd_nid_hash, m);
+	cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_hash_seq_show);
 
 int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = m->private;
+	struct target_distribute_txn_data *tdtd;
 
 	LASSERT(obd != NULL);
 
@@ -534,7 +579,9 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 		seq_printf(m, "COMPLETE\n");
 		seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
 		seq_printf(m, "recovery_duration: %lu\n",
-			   obd->obd_recovery_end - obd->obd_recovery_start);
+			   obd->obd_recovery_end ?
+			   obd->obd_recovery_end - obd->obd_recovery_start :
+			   cfs_time_current_sec() - obd->obd_recovery_start);
 		/* Number of clients that have completed recovery */
 		seq_printf(m, "completed_clients: %d/%d\n",
 			   obd->obd_max_recoverable_clients -
@@ -542,7 +589,7 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 			   obd->obd_max_recoverable_clients);
 		seq_printf(m, "replayed_requests: %d\n",
 			   obd->obd_replayed_requests);
-		seq_printf(m, "last_transno: "LPD64"\n",
+		seq_printf(m, "last_transno: %lld\n",
 			   obd->obd_next_recovery_transno - 1);
 		seq_printf(m, "VBR: %s\n", obd->obd_version_recov ?
 			   "ENABLED" : "DISABLED");
@@ -551,6 +598,33 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 		goto out;
 	}
 
+	tdtd = obd->u.obt.obt_lut->lut_tdtd;
+	if (tdtd && tdtd->tdtd_show_update_logs_retrievers) {
+		char *buf;
+		int size = 0;
+		int count = 0;
+
+		buf = tdtd->tdtd_show_update_logs_retrievers(
+			tdtd->tdtd_show_retrievers_cbdata,
+			&size, &count);
+		if (count > 0) {
+			seq_printf(m, "WAITING\n");
+			seq_printf(m, "non-ready MDTs: %s\n",
+				   buf ? buf : "unknown (not enough RAM)");
+			seq_printf(m, "recovery_start: %lu\n",
+				   obd->obd_recovery_start);
+			seq_printf(m, "time_waited: %lu\n",
+				   cfs_time_current_sec() -
+				   obd->obd_recovery_start);
+		}
+
+		if (buf != NULL)
+			OBD_FREE(buf, size);
+
+		if (likely(count > 0))
+			return 0;
+	}
+
 	seq_printf(m, "RECOVERING\n");
 	seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
 	seq_printf(m, "time_remaining: %lu\n",
@@ -575,7 +649,7 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 	seq_printf(m, "replayed_requests: %d\n", obd->obd_replayed_requests);
 	seq_printf(m, "queued_requests: %d\n",
 		   obd->obd_requests_queued_for_recovery);
-	seq_printf(m, "next_transno: "LPD64"\n",
+	seq_printf(m, "next_transno: %lld\n",
 		   obd->obd_next_recovery_transno);
 out:
 	return 0;
@@ -587,20 +661,22 @@ int lprocfs_ir_factor_seq_show(struct seq_file *m, void *data)
 	struct obd_device *obd = m->private;
 
 	LASSERT(obd != NULL);
-	return seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+	seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_ir_factor_seq_show);
 
 ssize_t
-lprocfs_ir_factor_seq_write(struct file *file, const char *buffer,
+lprocfs_ir_factor_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;
-	int val, rc;
+	int rc;
+	__s64 val;
 
 	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = lprocfs_str_to_s64(buffer, count, &val);
 	if (rc)
 		return rc;
 
@@ -617,22 +693,27 @@ int lprocfs_recovery_time_soft_seq_show(struct seq_file *m, void *data)
 	struct obd_device *obd = m->private;
 
 	LASSERT(obd != NULL);
-	return seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+	seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
 
 ssize_t
-lprocfs_recovery_time_soft_seq_write(struct file *file, const char *buffer,
-					size_t count, loff_t *off)
+lprocfs_recovery_time_soft_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;
-	int val, rc;
+	int rc;
+	__s64 val;
 
 	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = lprocfs_str_to_s64(buffer, count, &val);
 	if (rc)
 		return rc;
+	if (val < 0 || val > INT_MAX)
+		return -ERANGE;
 
 	obd->obd_recovery_timeout = val;
 	return count;
@@ -644,22 +725,27 @@ int lprocfs_recovery_time_hard_seq_show(struct seq_file *m, void *data)
 	struct obd_device *obd = m->private;
 
 	LASSERT(obd != NULL);
-	return seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+	seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);
 
 ssize_t
-lprocfs_recovery_time_hard_seq_write(struct file *file, const char *buffer,
+lprocfs_recovery_time_hard_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;
-	int val, rc;
+	int rc;
+	__s64 val;
 
 	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = lprocfs_str_to_s64(buffer, count, &val);
 	if (rc)
 		return rc;
+	if (val < 0 || val > INT_MAX)
+		return -ERANGE;
 
 	obd->obd_recovery_time_hard = val;
 	return count;
@@ -673,8 +759,9 @@ int lprocfs_target_instance_seq_show(struct seq_file *m, void *data)
 
 	LASSERT(obd != NULL);
 	LASSERT(target->obt_magic == OBT_MAGIC);
-	return seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+	seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_target_instance_seq_show);
 
-#endif /* LPROCFS*/
+#endif /* CONFIG_PROC_FS*/