* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
#else
-static int lmv_rd_numobd(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int lmv_numobd_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = (struct obd_device*)data;
+ struct obd_device *dev = (struct obd_device *)m->private;
struct lmv_desc *desc;
LASSERT(dev != NULL);
desc = &dev->u.lmv.desc;
- *eof = 1;
- return snprintf(page, count, "%u\n", desc->ld_tgt_count);
-
+ return seq_printf(m, "%u\n", desc->ld_tgt_count);
}
+LPROC_SEQ_FOPS_RO(lmv_numobd);
static const char *placement_name[] = {
[PLACEMENT_CHAR_POLICY] = "CHAR",
return placement_name[placement];
}
-static int lmv_rd_placement(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int lmv_placement_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = (struct obd_device*)data;
+ struct obd_device *dev = (struct obd_device *)m->private;
struct lmv_obd *lmv;
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
- *eof = 1;
- return snprintf(page, count, "%s\n",
- placement_policy2name(lmv->lmv_placement));
-
+ return seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
}
#define MAX_POLICY_STRING_SIZE 64
-static int lmv_wr_placement(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t lmv_placement_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;
char dummy[MAX_POLICY_STRING_SIZE + 1];
int len = count;
placement_policy_t policy;
struct lmv_obd *lmv;
- if (cfs_copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
+ if (copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
return -EFAULT;
LASSERT(dev != NULL);
}
return count;
}
+LPROC_SEQ_FOPS(lmv_placement);
-static int lmv_rd_activeobd(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int lmv_activeobd_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = (struct obd_device*)data;
+ struct obd_device *dev = (struct obd_device *)m->private;
struct lmv_desc *desc;
LASSERT(dev != NULL);
desc = &dev->u.lmv.desc;
- *eof = 1;
- return snprintf(page, count, "%u\n", desc->ld_active_tgt_count);
+ return seq_printf(m, "%u\n", desc->ld_active_tgt_count);
}
+LPROC_SEQ_FOPS_RO(lmv_activeobd);
-static int lmv_rd_desc_uuid(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int lmv_desc_uuid_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = (struct obd_device*) data;
+ struct obd_device *dev = (struct obd_device*)m->private;
struct lmv_obd *lmv;
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
- *eof = 1;
- return snprintf(page, count, "%s\n", lmv->desc.ld_uuid.uuid);
+ return seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid);
}
+LPROC_SEQ_FOPS_RO(lmv_desc_uuid);
static void *lmv_tgt_seq_start(struct seq_file *p, loff_t *pos)
{
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
{
struct lmv_tgt_desc *tgt = v;
- struct obd_device *dev = p->private;
- struct lmv_obd *lmv = &dev->u.lmv;
- int idx = tgt - lmv->tgts[0];
if (tgt == NULL)
return 0;
- return seq_printf(p, "%d: %s %sACTIVE\n", idx, tgt->ltd_uuid.uuid,
- tgt->ltd_active ? "" : "IN");
+ return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_idx,
+ tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
}
struct seq_operations lmv_tgt_sops = {
static int lmv_target_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = PDE(inode);
struct seq_file *seq;
int rc;
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_lmv_obd_vars[] = {
- { "numobd", lmv_rd_numobd, 0, 0 },
- { "placement", lmv_rd_placement, lmv_wr_placement, 0 },
- { "activeobd", lmv_rd_activeobd, 0, 0 },
- { "uuid", lprocfs_rd_uuid, 0, 0 },
- { "desc_uuid", lmv_rd_desc_uuid, 0, 0 },
- { 0 }
-};
-
-static struct lprocfs_vars lprocfs_lmv_module_vars[] = {
- { "num_refs", lprocfs_rd_numrefs, 0, 0 },
- { 0 }
+LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
+
+struct lprocfs_seq_vars lprocfs_lmv_obd_vars[] = {
+ { .name = "numobd",
+ .fops = &lmv_numobd_fops },
+ { .name = "placement",
+ .fops = &lmv_placement_fops },
+ { .name = "activeobd",
+ .fops = &lmv_activeobd_fops },
+ { .name = "uuid",
+ .fops = &lmv_uuid_fops },
+ { .name = "desc_uuid",
+ .fops = &lmv_desc_uuid_fops },
+ { 0 }
};
struct file_operations lmv_proc_target_fops = {
.llseek = seq_lseek,
.release = seq_release,
};
-
#endif /* LPROCFS */
-void lprocfs_lmv_init_vars(struct lprocfs_static_vars *lvars)
-{
- lvars->module_vars = lprocfs_lmv_module_vars;
- lvars->obd_vars = lprocfs_lmv_obd_vars;
-}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff