Branch b1_8

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.

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index d62d915..2c38c7c 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1144,7 +1144,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;