* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <lustre_fid.h>
#include "mgs_internal.h"
+/**
+ * Initialize MGS per-export statistics.
+ *
+ * This function sets up procfs entries for various MGS export counters. These
+ * counters are for per-client statistics tracked on the server.
+ *
+ * \param[in] obd OBD device
+ * \param[in] exp OBD export
+ * \param[in] localdata NID of client
+ *
+ * \retval 0 if successful
+ * \retval negative value on error
+ */
int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp,
- void *localdata)
-
+ void *localdata)
{
- lnet_nid_t *client_nid = localdata;
- int rc, newnid;
- ENTRY;
-
- rc = lprocfs_exp_setup(exp, client_nid, &newnid);
- if (rc) {
- /* Mask error for already created
- * /proc entries */
- if (rc == -EALREADY)
- rc = 0;
- RETURN(rc);
- }
- if (newnid) {
- struct nid_stat *tmp = exp->exp_nid_stats;
- int num_stats = 0;
-
- num_stats = (sizeof(*obd->obd_type->typ_dt_ops) / sizeof(void *)) +
- LPROC_MGS_LAST - 1;
- tmp->nid_stats = lprocfs_alloc_stats(num_stats,
- LPROCFS_STATS_FLAG_NOPERCPU);
- if (tmp->nid_stats == NULL)
- return -ENOMEM;
- lprocfs_init_ops_stats(LPROC_MGS_LAST, tmp->nid_stats);
- mgs_stats_counter_init(tmp->nid_stats);
- rc = lprocfs_register_stats(tmp->nid_proc, "stats",
- tmp->nid_stats);
- if (rc)
- GOTO(clean, rc);
-
- rc = lprocfs_nid_ldlm_stats_init(tmp);
- if (rc)
- GOTO(clean, rc);
- }
- RETURN(0);
-clean:
- return rc;
+ lnet_nid_t *client_nid = localdata;
+ struct nid_stat *stats;
+ int rc;
+ ENTRY;
+
+ rc = lprocfs_exp_setup(exp, client_nid);
+ if (rc != 0)
+ /* Mask error for already created /proc entries */
+ RETURN(rc == -EALREADY ? 0 : rc);
+
+ stats = exp->exp_nid_stats;
+ stats->nid_stats = lprocfs_alloc_stats(NUM_OBD_STATS + LPROC_MGS_LAST,
+ LPROCFS_STATS_FLAG_NOPERCPU);
+ if (stats->nid_stats == NULL)
+ RETURN(-ENOMEM);
+
+ lprocfs_init_ops_stats(LPROC_MGS_LAST, stats->nid_stats);
+
+ mgs_stats_counter_init(stats->nid_stats);
+
+ rc = lprocfs_register_stats(stats->nid_proc, "stats", stats->nid_stats);
+ if (rc != 0) {
+ lprocfs_free_stats(&stats->nid_stats);
+ GOTO(out, rc);
+ }
+
+ rc = lprocfs_nid_ldlm_stats_init(stats);
+ if (rc != 0)
+ GOTO(out, rc);
+
+out:
+ RETURN(rc);
}
/**
* crash all connections are treated as new connections.
*/
int mgs_client_add(struct obd_device *obd, struct obd_export *exp,
- void *localdata)
+ void *localdata)
{
return 0;
}
ENTRY;
- /* FIXME what's this? Do I need it? */
- rc = cfs_cleanup_group_info();
- if (rc)
- RETURN(rc);
-
OBD_SET_CTXT_MAGIC(&mgs->mgs_obd->obd_lvfs_ctxt);
mgs->mgs_obd->obd_lvfs_ctxt.dt = mgs->mgs_bottom;
GOTO(out_los, rc);
root = dt_locate_at(env, mgs->mgs_bottom, &rfid,
- &mgs->mgs_dt_dev.dd_lu_dev);
+ &mgs->mgs_dt_dev.dd_lu_dev, NULL);
if (unlikely(IS_ERR(root)))
GOTO(out_los, rc = PTR_ERR(root));
if (IS_ERR(o))
GOTO(out_root, rc = PTR_ERR(o));
+ if (!dt_try_as_dir(env, o)) {
+ lu_object_put(env, &o->do_lu);
+ GOTO(out_root, rc = -ENOTDIR);
+ }
+
mgs->mgs_configs_dir = o;
/* create directory to store nid table versions */