Branch b1_8

b=19345
i=shadow
i=wangdi

use shrink_dcache_sb() instead of shrink_dcache_parent().

diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index efc9f1b..2a2b2e4 100644 (file)
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -951,9 +951,9 @@ int mds_fs_cleanup(struct obd_device *obd)
 
         pop_ctxt(saved, &obd->obd_lvfs_ctxt, NULL);
         OBD_SLAB_FREE_PTR(saved, obd_lvfs_ctxt_cache);
-        shrink_dcache_parent(mds->mds_fid_de);
         dput(mds->mds_fid_de);
         LL_DQUOT_OFF(obd->u.obt.obt_sb, 0);
+        shrink_dcache_sb(mds->mds_obt.obt_sb);
 
         return rc;
 }

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index 5a8aea4..60fb831 100644 (file)
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -265,16 +265,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);