LU-8178 lproc: fix negative recovery_duration

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status_server.c

diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c
index 86e03ff..2790deb 100644 (file)
--- 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, 2014, Intel Corporation.
+ * Copyright (c) 2014, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -63,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;
@@ -109,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);
 
@@ -237,9 +238,9 @@ int lprocfs_exp_print_replydata_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
        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",
+                  "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,
@@ -260,8 +261,8 @@ 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);
 
@@ -286,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;
@@ -548,16 +549,15 @@ 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(m);
-       c += cfs_hash_debug_str(obd->obd_uuid_hash, m);
-       c += cfs_hash_debug_str(obd->obd_nid_hash, m);
-       c += cfs_hash_debug_str(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);
 
@@ -578,7 +578,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 -
@@ -631,20 +633,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;
 
@@ -661,22 +665,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;
@@ -688,22 +697,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;
@@ -717,7 +731,8 @@ 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);