-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
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;
+ struct obd_device *obd = (struct obd_device *)data;
- LASSERT(obd != NULL);
- LASSERT(obd->u.mgs.mgs_vfsmnt->mnt_devname);
- *eof = 1;
-
- return snprintf(page, count, "%s\n",obd->u.mgs.mgs_vfsmnt->mnt_devname);
+ LASSERT(obd != NULL);
+#if 0
+ /* will be fixed in the subsequent patch */
+ 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));
+#else
+ return 0;
+#endif
}
static int mgs_fs_seq_show(struct seq_file *seq, void *v)
{
struct obd_device *obd = seq->private;
- struct mgs_obd *mgs = &obd->u.mgs;
- struct list_head 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);
- rc = class_dentry_readdir(obd, mgs->mgs_configs_dir,
- mgs->mgs_vfsmnt, &dentry_list);
+ 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, &list);
if (rc) {
CERROR("Can't read config dir\n");
- RETURN(rc);
+ GOTO(out, rc);
}
- list_for_each_entry_safe(dirent, n, &dentry_list, lld_list) {
- 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:
+ lu_env_fini(&env);
RETURN(0);
}
LPROC_SEQ_FOPS_RO(mgs_fs);
-int lproc_mgs_setup(struct obd_device *obd)
+static void seq_show_srpc_rules(struct seq_file *seq, const char *tgtname,
+ struct sptlrpc_rule_set *rset)
+{
+ struct sptlrpc_rule *r;
+ char dirbuf[10];
+ char flvrbuf[40];
+ char *net;
+ int i;
+
+ for (i = 0; i < rset->srs_nrule; i++) {
+ r = &rset->srs_rules[i];
+
+ if (r->sr_netid == LNET_NIDNET(LNET_NID_ANY))
+ net = "default";
+ else
+ net = libcfs_net2str(r->sr_netid);
+
+ if (r->sr_from == LUSTRE_SP_ANY && r->sr_to == LUSTRE_SP_ANY)
+ dirbuf[0] = '\0';
+ else
+ snprintf(dirbuf, sizeof(dirbuf), ".%s2%s",
+ sptlrpc_part2name(r->sr_from),
+ sptlrpc_part2name(r->sr_to));
+
+ sptlrpc_flavor2name(&r->sr_flvr, flvrbuf, sizeof(flvrbuf));
+ seq_printf(seq, "%s.srpc.flavor.%s%s=%s\n", tgtname,
+ net, dirbuf, flvrbuf);
+ }
+}
+
+static int mgsself_srpc_seq_show(struct seq_file *seq, void *v)
{
- struct mgs_obd *mgs = &obd->u.mgs;
+ struct obd_device *obd = seq->private;
+ 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;
+
+ rc = mgs_find_or_make_fsdb(&env, mgs, MGSSELF_NAME, &fsdb);
+ if (rc)
+ goto out;
+
+ cfs_mutex_lock(&fsdb->fsdb_mutex);
+ seq_show_srpc_rules(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen);
+ cfs_mutex_unlock(&fsdb->fsdb_mutex);
+
+out:
+ lu_env_fini(&env);
+ return 0;
+}
+
+LPROC_SEQ_FOPS_RO(mgsself_srpc);
+
+int lproc_mgs_setup(struct mgs_device *mgs)
+{
+ struct obd_device *obd = mgs->mgs_obd;
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);
mgs->mgs_proc_live = lprocfs_register("live", obd->obd_proc_entry,
NULL, NULL);
return rc;
}
-int lproc_mgs_cleanup(struct obd_device *obd)
+int lproc_mgs_cleanup(struct mgs_device *mgs)
{
- struct mgs_obd *mgs;
+ struct obd_device *obd = mgs->mgs_obd;
if (!obd)
- RETURN(-EINVAL);
+ return -EINVAL;
- mgs = &obd->u.mgs;
if (mgs->mgs_proc_live) {
/* Should be no live entries */
LASSERT(mgs->mgs_proc_live->subdir == NULL);
lprocfs_remove(&mgs->mgs_proc_live);
mgs->mgs_proc_live = NULL;
}
+ lprocfs_free_per_client_stats(obd);
lprocfs_free_obd_stats(obd);
+ lprocfs_free_md_stats(obd);
return lprocfs_obd_cleanup(obd);
}
-static void seq_show_srpc_rule(struct seq_file *seq, const char *tgtname,
- struct sptlrpc_rule_set *rset)
-{
- struct sptlrpc_rule *r;
- char dirbuf[10];
- char flvrbuf[40];
- char *net;
- int i;
-
- for (i = 0; i < rset->srs_nrule; i++) {
- r = &rset->srs_rules[i];
-
- if (r->sr_netid == LNET_NIDNET(LNET_NID_ANY))
- net = "default";
- else
- net = libcfs_net2str(r->sr_netid);
-
- if (r->sr_from == LUSTRE_SP_ANY && r->sr_to == LUSTRE_SP_ANY)
- dirbuf[0] = '\0';
- else
- snprintf(dirbuf, sizeof(dirbuf), ".%s2%s",
- sptlrpc_part2name(r->sr_from),
- sptlrpc_part2name(r->sr_to));
-
- sptlrpc_flavor2name(&r->sr_flvr, flvrbuf, sizeof(flvrbuf));
- seq_printf(seq, "%s.srpc.flavor.%s%s=%s\n", tgtname,
- net, dirbuf, flvrbuf);
- }
-}
-
-static int mgs_live_seq_show(struct seq_file *seq, void *v)
+static int mgs_live_seq_show(struct seq_file *seq, void *v)
{
struct fs_db *fsdb = seq->private;
struct mgs_tgt_srpc_conf *srpc_tgt;
int i;
-
- down(&fsdb->fsdb_sem);
+
+ cfs_mutex_lock(&fsdb->fsdb_mutex);
seq_printf(seq, "fsname: %s\n", fsdb->fsdb_name);
- seq_printf(seq, "flags: %#x gen: %d\n",
+ seq_printf(seq, "flags: %#lx gen: %d\n",
fsdb->fsdb_flags, fsdb->fsdb_gen);
for (i = 0; i < INDEX_MAP_SIZE * 8; i++)
- if (test_bit(i, fsdb->fsdb_mdt_index_map))
+ if (cfs_test_bit(i, fsdb->fsdb_mdt_index_map))
seq_printf(seq, "%s-MDT%04x\n", fsdb->fsdb_name, i);
for (i = 0; i < INDEX_MAP_SIZE * 8; i++)
- if (test_bit(i, fsdb->fsdb_ost_index_map))
+ if (cfs_test_bit(i, fsdb->fsdb_ost_index_map))
seq_printf(seq, "%s-OST%04x\n", fsdb->fsdb_name, i);
seq_printf(seq, "\nSecure RPC Config Rules:\n");
#endif
for (srpc_tgt = fsdb->fsdb_srpc_tgt; srpc_tgt;
srpc_tgt = srpc_tgt->mtsc_next) {
- seq_show_srpc_rule(seq, srpc_tgt->mtsc_tgt,
- &srpc_tgt->mtsc_rset);
+ seq_show_srpc_rules(seq, srpc_tgt->mtsc_tgt,
+ &srpc_tgt->mtsc_rset);
}
- seq_show_srpc_rule(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen);
+ seq_show_srpc_rules(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen);
+
+ lprocfs_rd_ir_state(seq, fsdb);
- up(&fsdb->fsdb_sem);
+ cfs_mutex_unlock(&fsdb->fsdb_mutex);
return 0;
}
-LPROC_SEQ_FOPS_RO(mgs_live);
+static ssize_t mgs_live_seq_write(struct file *file, const char *buf,
+ size_t len, loff_t *off)
+{
+ struct seq_file *seq = file->private_data;
+ struct fs_db *fsdb = seq->private;
+ ssize_t rc;
-int lproc_mgs_add_live(struct obd_device *obd, struct fs_db *fsdb)
+ rc = lprocfs_wr_ir_state(file, buf, len, fsdb);
+ if (rc >= 0)
+ rc = len;
+ return rc;
+}
+LPROC_SEQ_FOPS(mgs_live);
+
+int lproc_mgs_add_live(struct mgs_device *mgs, struct fs_db *fsdb)
{
- struct mgs_obd *mgs = &obd->u.mgs;
int rc;
- if (!mgs->mgs_proc_live)
+ if (!mgs->mgs_proc_live)
return 0;
- rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0444,
+ rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0444,
&mgs_live_fops, fsdb);
return 0;
}
-int lproc_mgs_del_live(struct obd_device *obd, struct fs_db *fsdb)
+int lproc_mgs_del_live(struct mgs_device *mgs, struct fs_db *fsdb)
{
- struct mgs_obd *mgs = &obd->u.mgs;
-
- if (!mgs->mgs_proc_live)
+ if (!mgs->mgs_proc_live)
return 0;
lprocfs_remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live);
{ "num_exports", lprocfs_rd_num_exports, 0, 0 },
{ "hash_stats", lprocfs_obd_rd_hash, 0, 0 },
{ "evict_client", 0, lprocfs_wr_evict_client, 0 },
+ { "ir_timeout", lprocfs_rd_ir_timeout, lprocfs_wr_ir_timeout, 0 },
{ 0 }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff