From 2bf6bd1b82307d05035ac2e759ed153d16688803 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 10 Jun 2008 18:31:02 -0400
Subject: [PATCH] --- yaml --- r: 101901 b: refs/heads/master c:
 b5418383ef13f70528281546d02c15edc03d8567 h: refs/heads/master i:   101899:
 d66dc205b8d06d5a862fcd8dadbcd917cdc49151 v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfs/file.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2da2ad68b88f..c23d422713da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f38b873aeaae698c3693748438547c8493165fb
+refs/heads/master: b5418383ef13f70528281546d02c15edc03d8567
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 7ac89a845a5e..0213c21038fa 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -602,7 +602,8 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
 	 * This makes locking act as a cache coherency point.
 	 */
 	nfs_sync_mapping(filp->f_mapping);
-	nfs_zap_caches(inode);
+	if (!nfs_have_delegation(inode, FMODE_READ))
+		nfs_zap_caches(inode);
 out:
 	return status;
 }