From: adilger <adilger>
Date: Thu, 28 Aug 2003 18:33:35 +0000 (+0000)
Subject: Don't fail LASSERT if other lockers are pending on semaphore.
X-Git-Tag: v1_7_110~1^13~132
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ab5d030e3a2a415a8bc48a18c4a53604deacdb26;p=fs%2Flustre-release.git

Don't fail LASSERT if other lockers are pending on semaphore.
b=1734
r=zab
---

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 7b73cca..07e9278 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -530,7 +530,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 if (extent.start == 0)
                         ast_flags = LDLM_AST_DISCARD_DATA;
                 /* bug 1639: avoid write/truncate i_sem/DLM deadlock */
-                LASSERT(atomic_read(&inode->i_sem.count) == 0);
+                LASSERT(atomic_read(&inode->i_sem.count) <= 0);
                 up(&inode->i_sem);
                 rc = ll_extent_lock_no_validate(NULL, inode, lsm, LCK_PW,
                                                 &extent, &lockh, ast_flags);