* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
{
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,
&mgs_fs_fops, obd);
- rc = lprocfs_obd_seq_create(obd, "srpc_rules", 0600,
- &mgsself_srpc_fops, obd);
+ rc = lprocfs_obd_seq_create(obd, "srpc_rules", 0400,
+ &mgsself_srpc_fops, obd);
mgs->mgs_proc_live = lprocfs_register("live", obd->obd_proc_entry,
NULL, NULL);
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;
}
-int lproc_mgs_cleanup(struct mgs_device *mgs)
+void lproc_mgs_cleanup(struct mgs_device *mgs)
{
struct obd_device *obd = mgs->mgs_obd;
- if (!obd)
- return -EINVAL;
+ if (obd == NULL)
+ return;
+
+ 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);
mgs->mgs_proc_live = NULL;
}
lprocfs_free_per_client_stats(obd);
+ lprocfs_obd_cleanup(obd);
lprocfs_free_obd_stats(obd);
lprocfs_free_md_stats(obd);
-
- return lprocfs_obd_cleanup(obd);
}
static int mgs_live_seq_show(struct seq_file *seq, void *v)
if (!mgs->mgs_proc_live)
return 0;
- rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0444,
- &mgs_live_fops, fsdb);
+ rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0644,
+ &mgs_live_fops, fsdb);
return 0;
}
if (!mgs->mgs_proc_live)
return 0;
- lprocfs_remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live);
+ /* didn't create the proc file for MGSSELF_NAME */
+ if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags))
+ lprocfs_remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live);
return 0;
}
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 },