From 4c494c1f1573e63066460459bd64017600db3574 Mon Sep 17 00:00:00 2001 From: johann Date: Mon, 2 Jul 2007 18:48:31 +0000 Subject: [PATCH] Branch b1_6 Severity : normal Frequency : rare Bugzilla : 12629 Description: Deadlock during metadata tests Details : in prune_dir_dentries(), shrink_dcache_parent() should not be called with the per-dentry lock held. b=12629 i=alex i=shadow --- lustre/ChangeLog | 7 +++++++ lustre/llite/llite_lib.c | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index a2e8ec7..f8c0ec6 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -15,6 +15,13 @@ tbd Cluster File Systems, Inc. * bug fixes Severity : normal +Frequency : rare +Bugzilla : 12629 +Description: Deadlock during metadata tests +Details : in prune_dir_dentries(), shrink_dcache_parent() should not be + called with the per-dentry lock held. + +Severity : normal Frequency : SLES9 only Bugzilla : 12744 Description: Lustre patched kernel for SLES9 SP3 has NR_CPUS set to 8 diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index b0b7c43..0fefc5e 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -482,9 +482,7 @@ restart: spin_unlock(&dcache_lock); /* try to kill all child dentries */ - lock_dentry(dentry); shrink_dcache_parent(dentry); - unlock_dentry(dentry); dput(dentry); /* now try to get rid of current dentry */ -- 1.8.3.1