*/
#define DEBUG_SUBSYSTEM S_CLASS
-#include <linux/lustre_lite.h>
#include <linux/lprocfs_status.h>
+#include <linux/obd_class.h>
-/*
- * Common STATUS namespace
- */
+#ifndef LPROCFS
+struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+#else
-int rd_uuid(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- struct obd_device* dev = (struct obd_device*)data;
- return snprintf(page, count, "%s\n", dev->obd_uuid);
-}
+DEFINE_LPROCFS_STATFS_FCT(rd_blksize, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_kbytestotal, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_kbytesfree, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filestotal, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filesfree, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filegroups, obd_self_statfs);
int rd_stripesize(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct obd_device *dev = (struct obd_device*)data;
+ struct obd_device *dev = (struct obd_device *)data;
struct lov_desc *desc = &dev->u.lov.desc;
+ *eof = 1;
return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size);
}
int rd_stripeoffset(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 = &dev->u.lov;
+ struct obd_device *dev = (struct obd_device *)data;
+ struct lov_desc *desc = &dev->u.lov.desc;
- return snprintf(page, count, LPU64"\n",
- lov->desc.ld_default_stripe_offset);
+ *eof = 1;
+ return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_offset);
}
int rd_stripetype(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 = &dev->u.lov;
+ struct lov_desc *desc = &dev->u.lov.desc;
- return snprintf(page, count, "%u\n", lov->desc.ld_pattern);
+ *eof = 1;
+ return snprintf(page, count, "%u\n", desc->ld_pattern);
}
int rd_stripecount(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 = &dev->u.lov;
+ struct obd_device *dev = (struct obd_device *)data;
+ struct lov_desc *desc = &dev->u.lov.desc;
- return snprintf(page, count, "%u\n", lov->desc.ld_default_stripe_count);
+ *eof = 1;
+ return snprintf(page, count, "%u\n", desc->ld_default_stripe_count);
}
int rd_numobd(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 = &dev->u.lov;
+ struct lov_desc *desc = &dev->u.lov.desc;
- return snprintf(page, count, "%u\n", lov->desc.ld_tgt_count);
+ *eof = 1;
+ return snprintf(page, count, "%u\n", desc->ld_tgt_count);
}
void *data)
{
struct obd_device* dev = (struct obd_device*)data;
- struct lov_obd* lov = &dev->u.lov;
-
- return snprintf(page, count, "%u\n", lov->desc.ld_active_tgt_count);
-}
-
-int rd_blksize(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
-
-
-int rd_kbtotal(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
-
-
-int rd_kbfree(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
-
-int rd_filestotal(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
-
-int rd_filesfree(char* page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
+ struct lov_desc *desc = &dev->u.lov.desc;
-int rd_filegroups(char* page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
+ *eof = 1;
+ return snprintf(page, count, "%u\n", desc->ld_active_tgt_count);
}
int rd_target(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct obd_device* dev = (struct obd_device*)data;
- int len = 0, i = 0;
- struct lov_obd* lov = &dev->u.lov;
- struct lov_tgt_desc* tgts = lov->tgts;
- while (i < lov->desc.ld_tgt_count) {
- len += snprintf(&page[len], count - len, "%d: %s %sACTIVE\n",
- i, tgts->uuid, tgts->active ? "" : "IN");
- i++;
- tgts++;
+ struct obd_device *dev = (struct obd_device*) data;
+ int len = 0, i;
+ struct lov_obd *lov = &dev->u.lov;
+ struct lov_tgt_desc *tgts = lov->tgts;
+
+ for (i = 0; i < lov->desc.ld_tgt_count; i++, tgts++) {
+ int cur;
+ cur = snprintf(&page[len], count, "%d: %s %sACTIVE\n",
+ i, tgts->uuid.uuid, tgts->active ? "" : "IN");
+ len += cur;
+ count -= cur;
}
+ *eof = 1;
return len;
}
-int rd_mdc(char* page, char **start, off_t off, int count, int *eof, void *data)
+int rd_mdc(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- struct obd_device* dev = (struct obd_device*)data;
- int len = 0;
- struct lov_obd* lov = &dev->u.lov;
- len += snprintf(page, count, "%s\n", lov->mdcobd->obd_uuid);
- return len;
-}
+ struct obd_device *dev = (struct obd_device*) data;
+ struct lov_obd *lov = &dev->u.lov;
-struct lprocfs_vars status_var_nm_1[] = {
- {"status/uuid", rd_uuid, 0, 0},
- {"status/stripesize",rd_stripesize, 0, 0},
- {"status/stripeoffset",rd_stripeoffset, 0, 0},
- {"status/stripecount",rd_stripecount, 0, 0},
- {"status/stripetype", rd_stripetype, 0, 0},
- {"status/numobd",rd_numobd, 0, 0},
- {"status/activeobd", rd_activeobd, 0, 0},
- {"status/filestotal", rd_filestotal, 0, 0},
- {"status/filesfree", rd_filesfree, 0, 0},
- {"status/filegroups", rd_filegroups, 0, 0},
- {"status/blocksize", rd_blksize, 0, 0},
- {"status/kbytestotal", rd_kbtotal, 0, 0},
- {"status/kbytesfree", rd_kbfree, 0, 0},
- {"status/target_obd", rd_target, 0, 0},
- {"status/target_mdc", rd_mdc, 0, 0},
- {0}
+ *eof = 1;
+ return snprintf(page, count, "%s\n", lov->mdcobd->obd_uuid.uuid);
+}
+
+struct lprocfs_vars lprocfs_obd_vars[] = {
+ { "uuid", lprocfs_rd_uuid, 0, 0 },
+ { "stripesize", rd_stripesize, 0, 0 },
+ { "stripeoffset", rd_stripeoffset, 0, 0 },
+ { "stripecount", rd_stripecount, 0, 0 },
+ { "stripetype", rd_stripetype, 0, 0 },
+ { "numobd", rd_numobd, 0, 0 },
+ { "activeobd", rd_activeobd, 0, 0 },
+ { "filestotal", rd_filestotal, 0, 0 },
+ { "filesfree", rd_filesfree, 0, 0 },
+ { "filegroups", rd_filegroups, 0, 0 },
+ { "blocksize", rd_blksize, 0, 0 },
+ { "kbytestotal", rd_kbytestotal, 0, 0 },
+ { "kbytesfree", rd_kbytesfree, 0, 0 },
+ { "target_obd", rd_target, 0, 0 },
+ { "target_mdc", rd_mdc, 0, 0 },
+ { 0 }
};
-int rd_numrefs(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- struct obd_type* class = (struct obd_type*)data;
-
- return snprintf(page, count, "%d\n", class->typ_refcnt);
-}
-
-struct lprocfs_vars status_class_var[]={
- {"status/num_refs", rd_numrefs, 0, 0},
- {0}
+struct lprocfs_vars lprocfs_module_vars[] = {
+ { "num_refs", lprocfs_rd_numrefs, 0, 0 },
+ { 0 }
};
+
+#endif /* LPROCFS */
+LPROCFS_INIT_VARS(lprocfs_module_vars, lprocfs_obd_vars)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff