From 709c01f009edb783c9c660ec909f46ba4c3d0258 Mon Sep 17 00:00:00 2001 From: johann Date: Wed, 14 Oct 2009 20:59:10 +0000 Subject: [PATCH] Branch HEAD b=19345 i=shadow i=wangdi use shrink_dcache_sb() instead of shrink_dcache_parent() since the latter can hold the cpu for a long time. --- lustre/mds/handler.c | 2 +- lustre/mgs/mgs_fs.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index 0c137d9..45263f6 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -448,9 +448,9 @@ static int mds_cmd_cleanup(struct obd_device *obd) mds->mds_objects_dir = NULL; } - shrink_dcache_parent(mds->mds_fid_de); dput(mds->mds_fid_de); LL_DQUOT_OFF(obd->u.obt.obt_sb); + shrink_dcache_sb(mds->mds_obt.obt_sb); fsfilt_put_ops(obd->obd_fsops); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 586487f..fce4ffb 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -245,16 +245,12 @@ int mgs_fs_cleanup(struct obd_device *obd) 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); -- 1.8.3.1