Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8100 lmv: Correctly generate target_obd
[fs/lustre-release.git]
/
lustre
/
lmv
/
lproc_lmv.c
diff --git
a/lustre/lmv/lproc_lmv.c
b/lustre/lmv/lproc_lmv.c
index
5576798
..
02ea071
100644
(file)
--- a/
lustre/lmv/lproc_lmv.c
+++ b/
lustre/lmv/lproc_lmv.c
@@
-55,7
+55,8
@@
static int lmv_numobd_seq_show(struct seq_file *m, void *v)
LASSERT(dev != NULL);
desc = &dev->u.lmv.desc;
LASSERT(dev != NULL);
desc = &dev->u.lmv.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(lmv_numobd);
}
LPROC_SEQ_FOPS_RO(lmv_numobd);
@@
-89,7
+90,8
@@
static int lmv_placement_seq_show(struct seq_file *m, void *v)
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
- return seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
+ seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
+ return 0;
}
#define MAX_POLICY_STRING_SIZE 64
}
#define MAX_POLICY_STRING_SIZE 64
@@
-137,7
+139,8
@@
static int lmv_activeobd_seq_show(struct seq_file *m, void *v)
LASSERT(dev != NULL);
desc = &dev->u.lmv.desc;
LASSERT(dev != NULL);
desc = &dev->u.lmv.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(lmv_activeobd);
}
LPROC_SEQ_FOPS_RO(lmv_activeobd);
@@
-148,7
+151,8
@@
static int lmv_desc_uuid_seq_show(struct seq_file *m, void *v)
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
- return seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid);
+ seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid);
+ return 0;
}
LPROC_SEQ_FOPS_RO(lmv_desc_uuid);
}
LPROC_SEQ_FOPS_RO(lmv_desc_uuid);
@@
-156,7
+160,15
@@
static void *lmv_tgt_seq_start(struct seq_file *p, loff_t *pos)
{
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
{
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
- return (*pos >= lmv->desc.ld_tgt_count) ? NULL : lmv->tgts[*pos];
+
+ while (*pos < lmv->tgts_size) {
+ if (lmv->tgts[*pos] != NULL)
+ return lmv->tgts[*pos];
+
+ ++*pos;
+ }
+
+ return NULL;
}
static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
}
static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
@@
-168,8
+180,16
@@
static void *lmv_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)
{
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
{
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
+
++*pos;
++*pos;
- return (*pos >= lmv->desc.ld_tgt_count) ? NULL : lmv->tgts[*pos];
+ while (*pos < lmv->tgts_size) {
+ if (lmv->tgts[*pos] != NULL)
+ return lmv->tgts[*pos];
+
+ ++*pos;
+ }
+
+ return NULL;
}
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
}
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
@@
-178,8
+198,9
@@
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
if (tgt == NULL)
return 0;
if (tgt == NULL)
return 0;
- return seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,
- tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
+ seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,
+ tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
+ return 0;
}
static const struct seq_operations lmv_tgt_sops = {
}
static const struct seq_operations lmv_tgt_sops = {
@@
-205,7
+226,7
@@
static int lmv_target_seq_open(struct inode *inode, struct file *file)
LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
-struct lprocfs_
seq_
vars lprocfs_lmv_obd_vars[] = {
+struct lprocfs_vars lprocfs_lmv_obd_vars[] = {
{ .name = "numobd",
.fops = &lmv_numobd_fops },
{ .name = "placement",
{ .name = "numobd",
.fops = &lmv_numobd_fops },
{ .name = "placement",