From 65f547b30ba12ce346c93e5a014d913fe7505e0a Mon Sep 17 00:00:00 2001
From: zam <zam>
Date: Fri, 20 Mar 2009 16:40:51 +0000
Subject: [PATCH] Branch b_release_1_6_7 b=18859 i=oleg.drokin
 i=alexey.lyashkov

Don't do server-side locking if LL_FILE_IGNORE_LOCK is set. Otherwise we  have
a deadlock between server-side extent lock and a group lock owned by the same
client.
---
 lustre/llite/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 7b8e43a..ad59d7e 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1133,7 +1133,7 @@ static int ll_is_file_contended(struct file *file)
                 RETURN(0);
         }
         if (fd && (fd->fd_flags & LL_FILE_IGNORE_LOCK))
-                RETURN(1);
+                RETURN(0);
         if (test_bit(LLI_F_CONTENDED, &lli->lli_flags)) {
                 cfs_time_t cur_time = cfs_time_current();
                 cfs_time_t retry_time;
-- 
1.8.3.1