X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_fs.c;h=fce4ffbc6644edab268267da296c6f8981086cbc;hb=7e2daf1cd54d99f46e1bbb4b2d1a6f2269a4142e;hp=2812f84c7fa52a17308d60461731a5e850b43f32;hpb=9d3ad9fba3e244735f0994c3910e9de00e2a7f4d;p=fs%2Flustre-release.git

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index 2812f84..fce4ffb 100644
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -79,7 +79,8 @@ static int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp,
         if (newnid) {
                 /* Always add in ldlm_stats */
                 exp->exp_nid_stats->nid_ldlm_stats =
-                        lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC, 0);
+                        lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC, 
+                                            LPROCFS_STATS_FLAG_NOPERCPU);
                 if (exp->exp_nid_stats->nid_ldlm_stats == NULL)
                         return -ENOMEM;
                 lprocfs_init_ldlm_stats(exp->exp_nid_stats->nid_ldlm_stats);
@@ -244,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);