#ifdef LPROCFS
-static int lprocfs_mgs_rd_mntdev(char *page, char **start, off_t off, int count,
- int *eof, void *data)
-{
- struct obd_device *obd = (struct obd_device *)data;
-
- LASSERT(obd != NULL);
- LASSERT(mnt_get_devname(obd->u.mgs.mgs_vfsmnt));
- *eof = 1;
-
- return snprintf(page, count, "%s\n",
- mnt_get_devname(obd->u.mgs.mgs_vfsmnt));
-}
-
static int mgs_fs_seq_show(struct seq_file *seq, void *v)
{
struct obd_device *obd = seq->private;
- struct mgs_device *mgs = &obd->u.mgs;
- cfs_list_t dentry_list;
- struct l_linux_dirent *dirent, *n;
+ struct mgs_device *mgs;
+ cfs_list_t list;
+ struct mgs_direntry *dirent, *n;
struct lu_env env;
int rc, len;
ENTRY;
LASSERT(obd != NULL);
+ LASSERT(obd->obd_lu_dev != NULL);
+ mgs = lu2mgs_dev(obd->obd_lu_dev);
rc = lu_env_init(&env, LCT_MG_THREAD);
if (rc)
RETURN(rc);
- rc = class_dentry_readdir(&env, mgs, &dentry_list);
+ rc = class_dentry_readdir(&env, mgs, &list);
if (rc) {
CERROR("Can't read config dir\n");
GOTO(out, rc);
}
- cfs_list_for_each_entry_safe(dirent, n, &dentry_list, lld_list) {
- cfs_list_del(&dirent->lld_list);
- len = strlen(dirent->lld_name);
- if ((len > 7) && (strncmp(dirent->lld_name + len - 7, "-client",
- len) == 0)) {
- seq_printf(seq, "%.*s\n", len - 7, dirent->lld_name);
- }
- OBD_FREE(dirent, sizeof(*dirent));
+ cfs_list_for_each_entry_safe(dirent, n, &list, list) {
+ cfs_list_del(&dirent->list);
+ len = strlen(dirent->name);
+ if (len > 7 &&
+ strncmp(dirent->name + len - 7, "-client", len) == 0)
+ seq_printf(seq, "%.*s\n", len - 7, dirent->name);
+ mgs_direntry_free(dirent);
}
out:
static int mgsself_srpc_seq_show(struct seq_file *seq, void *v)
{
struct obd_device *obd = seq->private;
- struct mgs_device *mgs = &obd->u.mgs;
+ struct mgs_device *mgs;
struct fs_db *fsdb;
struct lu_env env;
int rc;
+ LASSERT(obd != NULL);
+ LASSERT(obd->obd_lu_dev != NULL);
+ mgs = lu2mgs_dev(obd->obd_lu_dev);
+
rc = lu_env_init(&env, LCT_MG_THREAD);
if (rc)
return rc;
LPROC_SEQ_FOPS_RO(mgsself_srpc);
-int lproc_mgs_setup(struct mgs_device *mgs)
+int lproc_mgs_setup(struct mgs_device *mgs, char *osd_name)
{
struct obd_device *obd = mgs->mgs_obd;
- int rc;
+ struct obd_device *osd_obd = mgs->mgs_bottom->dd_lu_dev.ld_obd;
+ int osd_suffix = strlen(osd_name) - strlen("-osd");
+ char c = osd_name[osd_suffix];
+ int rc;
rc = lprocfs_obd_seq_create(obd, "filesystems", 0444,
&mgs_fs_fops, obd);
obd->obd_proc_exports_entry = NULL;
}
- return rc;
+ osd_name[osd_suffix] = '\0'; /* Remove the "-osd" suffix. */
+ mgs->mgs_proc_mntdev = lprocfs_add_symlink("mntdev",
+ obd->obd_proc_entry,
+ "../../%s/%s/mntdev",
+ osd_obd->obd_type->typ_name,
+ osd_name);
+ osd_name[osd_suffix] = c;
+ if (mgs->mgs_proc_mntdev == NULL)
+ rc = -ENOMEM;
+
+ return rc;
}
int lproc_mgs_cleanup(struct mgs_device *mgs)
if (!obd)
return -EINVAL;
+ if (mgs->mgs_proc_mntdev)
+ lprocfs_remove(&mgs->mgs_proc_mntdev);
if (mgs->mgs_proc_live) {
/* Should be no live entries */
LASSERT(mgs->mgs_proc_live->subdir == NULL);
struct lprocfs_vars lprocfs_mgs_obd_vars[] = {
{ "uuid", lprocfs_rd_uuid, 0, 0 },
{ "fstype", lprocfs_rd_fstype, 0, 0 },
- { "mntdev", lprocfs_mgs_rd_mntdev, 0, 0 },
{ "num_exports", lprocfs_rd_num_exports, 0, 0 },
{ "hash_stats", lprocfs_obd_rd_hash, 0, 0 },
{ "evict_client", 0, lprocfs_wr_evict_client, 0 },