don't hit live lock with umount ost.

b=14645
i=johan
i=alex

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b45b51c..5051a49 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -26,6 +26,13 @@ tbd Sun Microsystems, Inc.
          For more information, please refer to bugzilla 13904.
 
 Severity   : minor
+Bugzilla   : 14645
+Frequency  : rare, on shutdown ost
+Description: don't hit live lock with umount ost.
+Description: shrink_dcache_parent can be in long loop with destroy dentries,
+            use shrink_dcache_sb instead.
+
+Severity   : minor
 Bugzilla   : 14949
 Description: don't panic with use echo client
 Details    : echo client pass NULL as client nid pointer and this produce null

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 0590bf4..8bd25cd 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -2023,9 +2023,8 @@ static int filter_cleanup(struct obd_device *obd)
 
         filter_post(obd);
 
-        shrink_dcache_parent(obd->u.obt.obt_sb->s_root);
-
         LL_DQUOT_OFF(obd->u.obt.obt_sb);
+        shrink_dcache_sb(obd->u.obt.obt_sb);
 
         server_put_mount(obd->obd_name, filter->fo_vfsmnt);
         obd->u.obt.obt_sb = NULL;