* 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.
*/
/*
#include <libcfs/list.h>
#include "mgs_internal.h"
-static int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp,
- void *localdata)
+int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp,
+ int reconnect, void *localdata)
+
{
lnet_nid_t *client_nid = localdata;
int rc, newnid;
+ ENTRY;
- rc = lprocfs_exp_setup(exp, client_nid, &newnid);
+ rc = lprocfs_exp_setup(exp, client_nid, reconnect, &newnid);
if (rc) {
/* Mask error for already created
* /proc entries */
if (rc == -EALREADY)
rc = 0;
- return rc;
+ RETURN(rc);
}
-
- if (!obd->md_stats &&
- lprocfs_alloc_md_stats(obd, LPROC_MGS_LAST))
- 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, 0);
- if (exp->exp_nid_stats->nid_ldlm_stats == NULL)
+ 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_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_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;
}
int mgs_client_add(struct obd_device *obd, struct obd_export *exp,
void *localdata)
{
- return mgs_export_stats_init(obd, exp, localdata);
+ return 0;
}
/* Remove client export data from the MGS */
/* we didn't find the right inode.. */
CDEBUG(D_INODE, "found wrong generation: inode %lu, link: %lu, "
"count: %d, generation %u/%u\n", inode->i_ino,
- (unsigned long)inode->i_nlink, atomic_read(&inode->i_count),
+ (unsigned long)inode->i_nlink,
+ atomic_read(&inode->i_count),
inode->i_generation, gen);
l_dput(result);
RETURN(ERR_PTR(-ENOENT));
ENTRY;
/* FIXME what's this? Do I need it? */
- rc = cleanup_group_info();
+ rc = cfs_cleanup_group_info();
if (rc)
RETURN(rc);
/* Need the iopen dir for fid2dentry, required by
LLOG_ORIGIN_HANDLE_READ_HEADER */
- dentry = lookup_one_len("__iopen__", current->fs->pwd,
+ dentry = ll_lookup_one_len("__iopen__", current->fs->pwd,
strlen("__iopen__"));
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (mgs->mgs_configs_dir) {
- /*CERROR("configs dir dcount=%d\n",
- atomic_read(&mgs->mgs_configs_dir->d_count));*/
l_dput(mgs->mgs_configs_dir);
mgs->mgs_configs_dir = NULL;
}
- shrink_dcache_parent(mgs->mgs_fid_de);
- /*CERROR("fid dir dcount=%d\n",
- atomic_read(&mgs->mgs_fid_de->d_count));*/
dput(mgs->mgs_fid_de);
+ shrink_dcache_sb(mgs->mgs_sb);
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);