X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Flov%2Flproc_lov.c;h=e8f9abbe9bf5598d85088021d45250129622d6bd;hb=b1e595c09e1b07a6840142b3ae015b8a5a8affeb;hp=44a35cd35171a8c0161e19a41ed3f53189365bd9;hpb=9fe6b20f03f57eb3a224dd203f74fb8fd8411c36;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 44a35cd..e8f9abb 100644
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,26 +39,26 @@
 #include <asm/statfs.h>
 #include <lprocfs_status.h>
 #include <obd_class.h>
-#include <linux/seq_file.h>
+#include <lustre_param.h>
 #include "lov_internal.h"
 
 #ifdef LPROCFS
-static int lov_rd_stripesize(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int lov_stripesize_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = (struct obd_device *)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size);
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+
+	return seq_printf(m, LPU64"\n", desc->ld_default_stripe_size);
 }
 
-static int lov_wr_stripesize(struct file *file, const char *buffer,
-                               unsigned long count, void *data)
+static ssize_t lov_stripesize_seq_write(struct file *file,
+					const char __user *buffer,
+					size_t count, loff_t *off)
 {
-        struct obd_device *dev = (struct obd_device *)data;
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
         struct lov_desc *desc;
         __u64 val;
         int rc;
@@ -73,23 +73,23 @@ static int lov_wr_stripesize(struct file *file, const char *buffer,
         desc->ld_default_stripe_size = val;
         return count;
 }
+LPROC_SEQ_FOPS(lov_stripesize);
 
-static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
+static int lov_stripeoffset_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = (struct obd_device *)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_offset);
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+	return seq_printf(m, LPU64"\n", desc->ld_default_stripe_offset);
 }
 
-static int lov_wr_stripeoffset(struct file *file, const char *buffer,
-                               unsigned long count, void *data)
+static ssize_t lov_stripeoffset_seq_write(struct file *file,
+					  const char __user *buffer,
+					  size_t count, loff_t *off)
 {
-        struct obd_device *dev = (struct obd_device *)data;
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
         struct lov_desc *desc;
         __u64 val;
         int rc;
@@ -103,23 +103,23 @@ static int lov_wr_stripeoffset(struct file *file, const char *buffer,
         desc->ld_default_stripe_offset = val;
         return count;
 }
+LPROC_SEQ_FOPS(lov_stripeoffset);
 
-static int lov_rd_stripetype(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int lov_stripetype_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device* dev = (struct obd_device*)data;
-        struct lov_desc *desc;
+	struct obd_device* dev = (struct obd_device*)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_pattern);
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+	return seq_printf(m, "%u\n", desc->ld_pattern);
 }
 
-static int lov_wr_stripetype(struct file *file, const char *buffer,
-                             unsigned long count, void *data)
+static ssize_t lov_stripetype_seq_write(struct file *file,
+					const char __user *buffer,
+					size_t count, loff_t *off)
 {
-        struct obd_device *dev = (struct obd_device *)data;
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
         struct lov_desc *desc;
         int val, rc;
 
@@ -133,24 +133,24 @@ static int lov_wr_stripetype(struct file *file, const char *buffer,
         desc->ld_pattern = val;
         return count;
 }
+LPROC_SEQ_FOPS(lov_stripetype);
 
-static int lov_rd_stripecount(char *page, char **start, off_t off, int count,
-                              int *eof, void *data)
+static int lov_stripecount_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = (struct obd_device *)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%d\n",
-                        (__s16)(desc->ld_default_stripe_count + 1) - 1);
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+	return seq_printf(m, "%d\n",
+			  (__s16)(desc->ld_default_stripe_count + 1) - 1);
 }
 
-static int lov_wr_stripecount(struct file *file, const char *buffer,
-                              unsigned long count, void *data)
+static ssize_t lov_stripecount_seq_write(struct file *file,
+					 const char __user *buffer,
+					 size_t count, loff_t *off)
 {
-        struct obd_device *dev = (struct obd_device *)data;
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
         struct lov_desc *desc;
         int val, rc;
 
@@ -164,147 +164,40 @@ static int lov_wr_stripecount(struct file *file, const char *buffer,
         desc->ld_default_stripe_count = val;
         return count;
 }
+LPROC_SEQ_FOPS(lov_stripecount);
 
-static int lov_rd_numobd(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
+static int lov_numobd_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device*)data;
-        struct lov_desc *desc;
-
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_tgt_count);
+	struct obd_device *dev = (struct obd_device*)m->private;
+	struct lov_desc *desc;
 
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+	return seq_printf(m, "%u\n", desc->ld_tgt_count);
 }
+LPROC_SEQ_FOPS_RO(lov_numobd);
 
-static int lov_rd_activeobd(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static int lov_activeobd_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device* dev = (struct obd_device*)data;
-        struct lov_desc *desc;
+	struct obd_device* dev = (struct obd_device*)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_active_tgt_count);
-}
-
-static int lov_rd_desc_uuid(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
-{
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
-
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%s\n", lov->desc.ld_uuid.uuid);
-}
-
-/* free priority (0-256): how badly user wants to choose empty osts */
-static int lov_rd_qos_priofree(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
-{
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
-
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        /* Round the conversion; see below */
-        return snprintf(page, count, "%d%%\n",
-                        (lov->lov_qos.lq_prio_free * 100 + 128) >> 8);
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
+	return seq_printf(m, "%u\n", desc->ld_active_tgt_count);
 }
+LPROC_SEQ_FOPS_RO(lov_activeobd);
 
-static int lov_wr_qos_priofree(struct file *file, const char *buffer,
-                               unsigned long count, void *data)
+static int lov_desc_uuid_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_obd *lov;
-        int val, rc;
-        LASSERT(dev != NULL);
-
-        lov = &dev->u.lov;
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
+	struct obd_device *dev = m->private;
+	struct lov_obd *lov;
 
-        if (val > 100 || val < 0)
-                return -EINVAL;
-        /* We're converting a 0-100% range to 0-256.
-         * Add some rounding so that when we convert back to %
-         * for printout below, we end up with the original value */
-        lov->lov_qos.lq_prio_free = ((val << 8) + 50) / 100;
-        lov->lov_qos.lq_dirty = 1;
-        lov->lov_qos.lq_reset = 1;
-        return count;
-}
-
-static int lov_rd_qos_thresholdrr(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data)
-{
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
-
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%d%%\n",
-                        ((lov->lov_qos.lq_threshold_rr * 100) + 128) >> 8);
-}
-
-static int lov_wr_qos_thresholdrr(struct file *file, const char *buffer,
-                                  unsigned long count, void *data)
-{
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_obd *lov;
-        int val, rc;
-        LASSERT(dev != NULL);
-
-        lov = &dev->u.lov;
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        if (val > 100 || val < 0)
-                return -EINVAL;
-
-        lov->lov_qos.lq_threshold_rr = ((val << 8) + 50) / 100;
-        lov->lov_qos.lq_dirty = 1;
-        return count;
-}
-
-static int lov_rd_qos_maxage(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
-{
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
-
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%u Sec\n", lov->desc.ld_qos_maxage);
-}
-
-static int lov_wr_qos_maxage(struct file *file, const char *buffer,
-                             unsigned long count, void *data)
-{
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_obd *lov;
-        int val, rc;
-        LASSERT(dev != NULL);
-
-        lov = &dev->u.lov;
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        if (val <= 0)
-                return -EINVAL;
-        lov->desc.ld_qos_maxage = val;
-        return count;
+	LASSERT(dev != NULL);
+	lov = &dev->u.lov;
+	return seq_printf(m, "%s\n", lov->desc.ld_uuid.uuid);
 }
+LPROC_SEQ_FOPS_RO(lov_desc_uuid);
 
 static void *lov_tgt_seq_start(struct seq_file *p, loff_t *pos)
 {
@@ -338,9 +231,9 @@ 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");
+	return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index,
+			  obd_uuid2str(&tgt->ltd_uuid),
+			  tgt->ltd_active ? "" : "IN");
 }
 
 struct seq_operations lov_tgt_sops = {
@@ -352,55 +245,59 @@ struct seq_operations lov_tgt_sops = {
 
 static int lov_target_seq_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(inode);
-        struct seq_file *seq;
-        int rc;
+	struct seq_file *seq;
+	int rc;
 
-        LPROCFS_ENTRY_AND_CHECK(dp);
-        rc = seq_open(file, &lov_tgt_sops);
-        if (rc) {
-                LPROCFS_EXIT();
-                return rc;
-        }
+	LPROCFS_ENTRY_CHECK(PDE(inode));
+	rc = seq_open(file, &lov_tgt_sops);
+	if (rc)
+		return rc;
 
-        seq = file->private_data;
-        seq->private = dp->data;
-        return 0;
+	seq = file->private_data;
+	seq->private = PDE_DATA(inode);
+	return 0;
 }
 
-struct lprocfs_vars lprocfs_lov_obd_vars[] = {
-        { "uuid",         lprocfs_rd_uuid,        0, 0 },
-        { "stripesize",   lov_rd_stripesize,      lov_wr_stripesize, 0 },
-        { "stripeoffset", lov_rd_stripeoffset,    lov_wr_stripeoffset, 0 },
-        { "stripecount",  lov_rd_stripecount,     lov_wr_stripecount, 0 },
-        { "stripetype",   lov_rd_stripetype,      lov_wr_stripetype, 0 },
-        { "numobd",       lov_rd_numobd,          0, 0 },
-        { "activeobd",    lov_rd_activeobd,       0, 0 },
-        { "filestotal",   lprocfs_rd_filestotal,  0, 0 },
-        { "filesfree",    lprocfs_rd_filesfree,   0, 0 },
-        /*{ "filegroups", lprocfs_rd_filegroups,  0, 0 },*/
-        { "blocksize",    lprocfs_rd_blksize,     0, 0 },
-        { "kbytestotal",  lprocfs_rd_kbytestotal, 0, 0 },
-        { "kbytesfree",   lprocfs_rd_kbytesfree,  0, 0 },
-        { "kbytesavail",  lprocfs_rd_kbytesavail, 0, 0 },
-        { "desc_uuid",    lov_rd_desc_uuid,       0, 0 },
-        { "qos_prio_free",lov_rd_qos_priofree,    lov_wr_qos_priofree, 0 },
-        { "qos_threshold_rr",  lov_rd_qos_thresholdrr, lov_wr_qos_thresholdrr, 0 },
-        { "qos_maxage",   lov_rd_qos_maxage,      lov_wr_qos_maxage, 0 },
-        { 0 }
+LPROC_SEQ_FOPS_RO_TYPE(lov, uuid);
+LPROC_SEQ_FOPS_RO_TYPE(lov, filestotal);
+LPROC_SEQ_FOPS_RO_TYPE(lov, filesfree);
+LPROC_SEQ_FOPS_RO_TYPE(lov, blksize);
+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[] = {
+	{ .name	=	"uuid",
+	  .fops	=	&lov_uuid_fops		},
+	{ .name	=	"stripesize",
+	  .fops	=	&lov_stripesize_fops	},
+	{ .name	=	"stripeoffset",
+	  .fops	=	&lov_stripeoffset_fops	},
+	{ .name	=	"stripecount",
+	  .fops	=	&lov_stripecount_fops	},
+	{ .name	=	"stripetype",
+	  .fops	=	&lov_stripetype_fops	},
+	{ .name	=	"numobd",
+	  .fops	=	&lov_numobd_fops	},
+	{ .name	=	"activeobd",
+	  .fops	=	&lov_activeobd_fops	},
+	{ .name	=	"filestotal",
+	  .fops	=	&lov_filestotal_fops	},
+	{ .name	=	"filesfree",
+	  .fops	=	&lov_filesfree_fops	},
+	{ .name	=	"blocksize",
+	  .fops	=	&lov_blksize_fops	},
+	{ .name	=	"kbytestotal",
+	  .fops	=	&lov_kbytestotal_fops	},
+	{ .name	=	"kbytesfree",
+	  .fops	=	&lov_kbytesfree_fops	},
+	{ .name	=	"kbytesavail",
+	  .fops	=	&lov_kbytesavail_fops	},
+	{ .name	=	"desc_uuid",
+	  .fops	=	&lov_desc_uuid_fops	},
+	{ 0 }
 };
 
-static struct lprocfs_vars lprocfs_lov_module_vars[] = {
-        { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
-        { 0 }
-};
-
-void lprocfs_lov_init_vars(struct lprocfs_static_vars *lvars)
-{
-    lvars->module_vars  = lprocfs_lov_module_vars;
-    lvars->obd_vars     = lprocfs_lov_obd_vars;
-}
-
 struct file_operations lov_proc_target_fops = {
         .owner   = THIS_MODULE,
         .open    = lov_target_seq_open,