Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-7334 lprocfs: Refactored string to value helpers
[fs/lustre-release.git] / lustre / lov / lproc_lov.c
diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 77a429e..ac3bb1a 100644 (file)
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,7 +42,7 @@
 #include <lustre_param.h>
 #include "lov_internal.h"
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 static int lov_stripesize_seq_show(struct seq_file *m, void *v)
 {
        struct obd_device *dev = (struct obd_device *)m->private;
@@ -51,7 +51,8 @@ static int lov_stripesize_seq_show(struct seq_file *m, void *v)
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
 
-       return seq_printf(m, LPU64"\n", desc->ld_default_stripe_size);
+       seq_printf(m, LPU64"\n", desc->ld_default_stripe_size);
+       return 0;
 }
 
 static ssize_t lov_stripesize_seq_write(struct file *file,
@@ -59,19 +60,22 @@ static ssize_t lov_stripesize_seq_write(struct file *file,
                                        size_t count, loff_t *off)
 {
        struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        struct lov_desc *desc;
-        __u64 val;
-        int rc;
-
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        rc = lprocfs_write_u64_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        lov_fix_desc_stripe_size(&val);
-        desc->ld_default_stripe_size = val;
-        return count;
+       struct lov_desc *desc;
+       __s64 val;
+       int rc;
+
+       LASSERT(dev != NULL);
+       desc = &dev->u.lov.desc;
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc)
+               return rc;
+       if (val < 0)
+               return -ERANGE;
+
+       lov_fix_desc_stripe_size(&val);
+       desc->ld_default_stripe_size = val;
+
+       return count;
 }
 LPROC_SEQ_FOPS(lov_stripesize);
 
@@ -82,7 +86,8 @@ static int lov_stripeoffset_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
-       return seq_printf(m, LPU64"\n", desc->ld_default_stripe_offset);
+       seq_printf(m, LPU64"\n", desc->ld_default_stripe_offset);
+       return 0;
 }
 
 static ssize_t lov_stripeoffset_seq_write(struct file *file,
@@ -90,18 +95,21 @@ static ssize_t lov_stripeoffset_seq_write(struct file *file,
                                          size_t count, loff_t *off)
 {
        struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        struct lov_desc *desc;
-        __u64 val;
-        int rc;
-
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        rc = lprocfs_write_u64_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        desc->ld_default_stripe_offset = val;
-        return count;
+       struct lov_desc *desc;
+       __s64 val;
+       int rc;
+
+       LASSERT(dev != NULL);
+       desc = &dev->u.lov.desc;
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc)
+               return rc;
+       if (val < 0)
+               return -ERANGE;
+
+       desc->ld_default_stripe_offset = val;
+
+       return count;
 }
 LPROC_SEQ_FOPS(lov_stripeoffset);
 
@@ -112,7 +120,8 @@ static int lov_stripetype_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
-       return seq_printf(m, "%u\n", desc->ld_pattern);
+       seq_printf(m, "%u\n", desc->ld_pattern);
+       return 0;
 }
 
 static ssize_t lov_stripetype_seq_write(struct file *file,
@@ -120,18 +129,23 @@ static ssize_t lov_stripetype_seq_write(struct file *file,
                                        size_t count, loff_t *off)
 {
        struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        struct lov_desc *desc;
-        int val, rc;
-
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        lov_fix_desc_pattern(&val);
-        desc->ld_pattern = val;
-        return count;
+       struct lov_desc *desc;
+       int pattern, rc;
+       __s64 val;
+
+       LASSERT(dev != NULL);
+       desc = &dev->u.lov.desc;
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc)
+               return rc;
+       if (val < INT_MIN || val > INT_MAX)
+               return -ERANGE;
+
+       pattern = val;
+       lov_fix_desc_pattern(&pattern);
+       desc->ld_pattern = pattern;
+
+       return count;
 }
 LPROC_SEQ_FOPS(lov_stripetype);
 
@@ -142,8 +156,9 @@ static int lov_stripecount_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
-       return seq_printf(m, "%d\n",
-                         (__s16)(desc->ld_default_stripe_count + 1) - 1);
+       seq_printf(m, "%d\n",
+                 (__s16)(desc->ld_default_stripe_count + 1) - 1);
+       return 0;
 }
 
 static ssize_t lov_stripecount_seq_write(struct file *file,
@@ -151,18 +166,24 @@ static ssize_t lov_stripecount_seq_write(struct file *file,
                                         size_t count, loff_t *off)
 {
        struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        struct lov_desc *desc;
-        int val, rc;
-
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        lov_fix_desc_stripe_count(&val);
-        desc->ld_default_stripe_count = val;
-        return count;
+       struct lov_desc *desc;
+       int rc;
+       __u32 stripe_count;
+       __s64 val;
+
+       LASSERT(dev != NULL);
+       desc = &dev->u.lov.desc;
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc)
+               return rc;
+       if (val < 0)
+               return -ERANGE;
+
+       stripe_count = val;
+       lov_fix_desc_stripe_count(&stripe_count);
+       desc->ld_default_stripe_count = stripe_count;
+
+       return count;
 }
 LPROC_SEQ_FOPS(lov_stripecount);
 
@@ -173,7 +194,8 @@ static int lov_numobd_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
-       return seq_printf(m, "%u\n", desc->ld_tgt_count);
+       seq_printf(m, "%u\n", desc->ld_tgt_count);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lov_numobd);
 
@@ -184,7 +206,8 @@ static int lov_activeobd_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        desc = &dev->u.lov.desc;
-       return seq_printf(m, "%u\n", desc->ld_active_tgt_count);
+       seq_printf(m, "%u\n", desc->ld_active_tgt_count);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lov_activeobd);
 
@@ -195,7 +218,8 @@ static int lov_desc_uuid_seq_show(struct seq_file *m, void *v)
 
        LASSERT(dev != NULL);
        lov = &dev->u.lov;
-       return seq_printf(m, "%s\n", lov->desc.ld_uuid.uuid);
+       seq_printf(m, "%s\n", lov->desc.ld_uuid.uuid);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lov_desc_uuid);
 
@@ -231,9 +255,10 @@ static void *lov_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)
 static int lov_tgt_seq_show(struct seq_file *p, void *v)
 {
         struct lov_tgt_desc *tgt = v;
-       return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index,
-                         obd_uuid2str(&tgt->ltd_uuid),
-                         tgt->ltd_active ? "" : "IN");
+       seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index,
+                  obd_uuid2str(&tgt->ltd_uuid),
+                  tgt->ltd_active ? "" : "IN");
+       return 0;
 }
 
 static const struct seq_operations lov_tgt_sops = {
@@ -248,7 +273,10 @@ static int lov_target_seq_open(struct inode *inode, struct file *file)
        struct seq_file *seq;
        int rc;
 
-       LPROCFS_ENTRY_CHECK(PDE(inode));
+       rc = LPROCFS_ENTRY_CHECK(inode);
+       if (rc < 0)
+               return rc;
+
        rc = seq_open(file, &lov_tgt_sops);
        if (rc)
                return rc;
@@ -266,7 +294,7 @@ LPROC_SEQ_FOPS_RO_TYPE(lov, kbytestotal);
 LPROC_SEQ_FOPS_RO_TYPE(lov, kbytesfree);
 LPROC_SEQ_FOPS_RO_TYPE(lov, kbytesavail);
 
-struct lprocfs_seq_vars lprocfs_lov_obd_vars[] = {
+struct lprocfs_vars lprocfs_lov_obd_vars[] = {
        { .name =       "uuid",
          .fops =       &lov_uuid_fops          },
        { .name =       "stripesize",
@@ -295,7 +323,7 @@ struct lprocfs_seq_vars lprocfs_lov_obd_vars[] = {
          .fops =       &lov_kbytesavail_fops   },
        { .name =       "desc_uuid",
          .fops =       &lov_desc_uuid_fops     },
-       { 0 }
+       { NULL }
 };
 
 struct file_operations lov_proc_target_fops = {
@@ -305,4 +333,4 @@ struct file_operations lov_proc_target_fops = {
         .llseek  = seq_lseek,
         .release = lprocfs_seq_release,
 };
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */
Lustre primary development and releases