From a28ed8f7153f8d9ea566467a8a62784838034456 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 29 Apr 2012 12:30:19 -0400
Subject: [PATCH] --- yaml --- r: 308576 b: refs/heads/master c:
 01da47bde78ff2149f6546a0f17e25983aaddd7b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3e7036311cad..562ca90f3081 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4b1eadf7c5f00636500ad47f68edc0666e63ea5
+refs/heads/master: 01da47bde78ff2149f6546a0f17e25983aaddd7b
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index fed27c0d1a4d..81946e77647c 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -955,6 +955,8 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
 	unsigned long invalid = 0;
 
 
+	if (nfs_have_delegated_attributes(inode))
+		return 0;
 	/* Has the inode gone and changed behind our back? */
 	if ((fattr->valid & NFS_ATTR_FATTR_FILEID) && nfsi->fileid != fattr->fileid)
 		return -EIO;