From fb83e28e916bf446b70a5912989684c2a0831292 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Tue, 14 Apr 2009 12:53:41 +0000
Subject: [PATCH] Branch b1_6 b=18399

i=adilger, johann

Patch the kernel to avoid the deadlock in prune_icache().
Author: ZhangHongChao
---
 lustre/ChangeLog                               | 5 +++++
 lustre/kernel_patches/series/2.6-rhel5.series  | 1 +
 lustre/kernel_patches/series/2.6-sles10.series | 1 +
 3 files changed, 7 insertions(+)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 5dc27cf..cf1885d 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -44,6 +44,11 @@ tbd Sun Microsystems, Inc.
 	  of Lustre filesystem with 4K stack may cause a stack overflow. For
 	  more information, please refer to bugzilla 17630.
 
+Severity   : normal
+Bugzilla   : 18399
+Descriptoin: OSS DeadLock
+Details    : Use trylock to prevent deadlock when shrink icache.
+
 Severity   : enhancement
 Bugzilla   : 17974
 Description: add lazystatfs mount option to allow statfs(2) to skip down OSTs
diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series
index 71e15ef..f43347a 100644
--- a/lustre/kernel_patches/series/2.6-rhel5.series
+++ b/lustre/kernel_patches/series/2.6-rhel5.series
@@ -21,3 +21,4 @@ md-soft-lockups.patch
 jbd-journal-chksum-2.6.18-vanilla.patch
 quota-large-limits-rhel5.patch
 md-mmp-unplug-dev.patch
+prune-icache-use-trylock-rhel5.patch
diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series
index 3c189c1..a6fdd79 100644
--- a/lustre/kernel_patches/series/2.6-sles10.series
+++ b/lustre/kernel_patches/series/2.6-sles10.series
@@ -13,3 +13,4 @@ quota-fix-oops-in-invalidate_dquots.patch
 jbd-journal-chksum-2.6-sles10.patch
 quota-large-limits-sles10.patch
 md-mmp-unplug-dev-sles10.patch
+prune-icache-use-trylock-sles10.patch
-- 
1.8.3.1