-/* -*- 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) 2008, 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/
*
* Lustre Metadata Server (MDS) filesystem interface code
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
+
#define DEBUG_SUBSYSTEM S_MDS
#include "mdt_internal.h"
{
lnet_nid_t *client_nid = localdata;
int rc, newnid;
+ ENTRY;
rc = lprocfs_exp_setup(exp, client_nid, &newnid);
if (rc) {
* /proc entries */
if (rc == -EALREADY)
rc = 0;
- return rc;
+ RETURN(rc);
}
-
- if ((obd->md_stats == NULL) &&
- (rc = lprocfs_alloc_md_stats(obd, LPROC_MDT_NR)))
- return rc;
if (newnid) {
- /* Always add in ldlm_stats */
- exp->exp_nid_stats->nid_ldlm_stats =
- lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC,
- LPROCFS_STATS_FLAG_NOPERCPU);
- if (exp->exp_nid_stats->nid_ldlm_stats == NULL)
+ struct nid_stat *tmp = exp->exp_nid_stats;
+ int num_stats;
+
+ num_stats = (sizeof(*obd->obd_type->typ_md_ops) / sizeof(void *)) +
+ LPROC_MDT_LAST;
+ tmp->nid_stats = lprocfs_alloc_stats(num_stats,
+ LPROCFS_STATS_FLAG_NOPERCPU);
+ if (tmp->nid_stats == NULL)
return -ENOMEM;
- lprocfs_init_ldlm_stats(exp->exp_nid_stats->nid_ldlm_stats);
- rc = lprocfs_register_stats(exp->exp_nid_stats->nid_proc,
- "ldlm_stats",
- exp->exp_nid_stats->nid_ldlm_stats);
+ lprocfs_init_mps_stats(LPROC_MDT_LAST, tmp->nid_stats);
+ mdt_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;
}