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 (file)
--- 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);