int count, int *eof, void *data);
extern int lprocfs_rd_name(char *page, char **start, off_t off,
int count, int *eof, void *data);
-extern int lprocfs_rd_fstype(char *page, char **start, off_t off,
- int count, int *eof, void *data);
extern int lprocfs_rd_server_uuid(char *page, char **start, off_t off,
int count, int *eof, void *data);
extern int lprocfs_rd_conn_uuid(char *page, char **start, off_t off,
{
struct obd_device *obd = mgs->mgs_obd;
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 osd_len = strlen(osd_name) - strlen("-osd");
int rc;
rc = lprocfs_obd_seq_create(obd, "filesystems", 0444,
obd->obd_proc_exports_entry = NULL;
}
- osd_name[osd_suffix] = '\0'; /* Remove the "-osd" suffix. */
+ mgs->mgs_proc_osd = lprocfs_add_symlink("osd",
+ obd->obd_proc_entry,
+ "../../%s/%.*s",
+ osd_obd->obd_type->typ_name,
+ osd_len, /* Strip "-osd". */
+ osd_name);
+ if (mgs->mgs_proc_osd == NULL)
+ rc = -ENOMEM;
+
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;
+ "osd/mntdev");
if (mgs->mgs_proc_mntdev == NULL)
rc = -ENOMEM;
+ mgs->mgs_proc_fstype = lprocfs_add_symlink("fstype",
+ obd->obd_proc_entry,
+ "osd/fstype");
+ if (mgs->mgs_proc_fstype == NULL)
+ rc = -ENOMEM;
+
return rc;
}
if (!obd)
return -EINVAL;
+ if (mgs->mgs_proc_osd != NULL)
+ lprocfs_remove(&mgs->mgs_proc_osd);
+
+ if (mgs->mgs_proc_fstype != NULL)
+ lprocfs_remove(&mgs->mgs_proc_fstype);
+
if (mgs->mgs_proc_mntdev)
lprocfs_remove(&mgs->mgs_proc_mntdev);
if (mgs->mgs_proc_live) {
struct lprocfs_vars lprocfs_mgs_obd_vars[] = {
{ "uuid", lprocfs_rd_uuid, 0, 0 },
- { "fstype", lprocfs_rd_fstype, 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 },
}
EXPORT_SYMBOL(lprocfs_rd_name);
-int lprocfs_rd_fstype(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- struct obd_device *obd = data;
-
- LASSERT(obd != NULL);
- LASSERT(obd->obd_fsops != NULL);
- LASSERT(obd->obd_fsops->fs_type != NULL);
- return snprintf(page, count, "%s\n", obd->obd_fsops->fs_type);
-}
-EXPORT_SYMBOL(lprocfs_rd_fstype);
-
int lprocfs_rd_blksize(char *page, char **start, off_t off, int count,
int *eof, void *data)
{