From: nikita <nikita>
Date: Mon, 23 Oct 2006 15:59:57 +0000 (+0000)
Subject: dynlocks: fix assertion that does not take read-locking into account.
X-Git-Tag: v1_8_0_110~486^2~375
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ee45813457e7df50f9871afc31ecc7a7a064ec21;p=fs%2Flustre-release.git

dynlocks: fix assertion that does not take read-locking into account.
---

diff --git a/lustre/kernel_patches/patches/dynamic-locks-2.6.9.patch b/lustre/kernel_patches/patches/dynamic-locks-2.6.9.patch
index 61b6f12..5928ea8 100644
--- a/lustre/kernel_patches/patches/dynamic-locks-2.6.9.patch
+++ b/lustre/kernel_patches/patches/dynamic-locks-2.6.9.patch
@@ -255,7 +255,7 @@ Index: linux/lib/dynlocks.c
 +	BUG_ON(hl == NULL);
 +	BUG_ON(dl->dl_magic != DYNLOCK_LIST_MAGIC);
 +	BUG_ON(hl->dl_magic != DYNLOCK_MAGIC);
-+	BUG_ON(current->pid != hl->dl_pid);
++	BUG_ON(hl->dl_writers != 0 && current->pid != hl->dl_pid);
 +
 +	spin_lock(&dl->dl_list_lock);
 +	if (hl->dl_writers) {