Whamcloud - gitweb
LU-3319 procfs: move lov proc handling over to seq_file
[fs/lustre-release.git] / lustre / lov / lproc_lov.c
index 850bb39..e400faf 100644 (file)
 #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 *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;
-        
+
         LASSERT(dev != NULL);
         desc = &dev->u.lov.desc;
         rc = lprocfs_write_u64_helper(buffer, count, &val);
@@ -73,27 +72,26 @@ 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 *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;
-        
+
         LASSERT(dev != NULL);
         desc = &dev->u.lov.desc;
         rc = lprocfs_write_u64_helper(buffer, count, &val);
@@ -103,26 +101,25 @@ 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 *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;
-        
+
         LASSERT(dev != NULL);
         desc = &dev->u.lov.desc;
         rc = lprocfs_write_helper(buffer, count, &val);
@@ -133,27 +130,26 @@ 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 *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;
-        
+
         LASSERT(dev != NULL);
         desc = &dev->u.lov.desc;
         rc = lprocfs_write_helper(buffer, count, &val);
@@ -164,43 +160,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);
+       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_rd_desc_uuid(char *page, char **start, off_t off, int count,
-                            int *eof, 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;
+       struct obd_device *dev = m->private;
+       struct lov_obd *lov;
 
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%s\n", lov->desc.ld_uuid.uuid);
+       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)
 {
@@ -248,50 +241,45 @@ 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_CHECK(dp);
-        rc = seq_open(file, &lov_tgt_sops);
+       LPROCFS_ENTRY_CHECK(PDE(inode));
+       rc = seq_open(file, &lov_tgt_sops);
        if (rc)
-                return 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 },
-        { 0 }
-};
-
-static struct lprocfs_vars lprocfs_lov_module_vars[] = {
-        { "num_refs",     lprocfs_rd_numrefs,     0, 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[] = {
+       { "uuid",               &lov_uuid_fops          },
+       { "stripesize",         &lov_stripesize_fops    },
+       { "stripeoffset",       &lov_stripeoffset_fops  },
+       { "stripecount",        &lov_stripecount_fops   },
+       { "stripetype",         &lov_stripetype_fops    },
+       { "numobd",             &lov_numobd_fops        },
+       { "activeobd",          &lov_activeobd_fops     },
+       { "filestotal",         &lov_filestotal_fops    },
+       { "filesfree",          &lov_filesfree_fops     },
+       { "blocksize",          &lov_blksize_fops       },
+       { "kbytestotal",        &lov_kbytestotal_fops   },
+       { "kbytesfree",         &lov_kbytesfree_fops    },
+       { "kbytesavail",        &lov_kbytesavail_fops   },
+       { "desc_uuid",          &lov_desc_uuid_fops     },
+       { 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,