From de8b7483b05fc60ea41515d07a167ea77a7e651c Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 5 Dec 2012 16:31:49 +0000
Subject: [PATCH] --- yaml --- r: 347833 b: refs/heads/master c:
 a4ff146881c2764d7c3e4ef710e7c27d521ddd51 h: refs/heads/master i:   347831:
 1bc5bd3185128926524a76e00d7872b862e54a8b v: v3

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

diff --git a/[refs] b/[refs]
index 9b5702e69513..999a74a841df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 969695215f9a865cbf64c4ce3742ac9fc57fffed
+refs/heads/master: a4ff146881c2764d7c3e4ef710e7c27d521ddd51
diff --git a/trunk/fs/nfs/fscache.c b/trunk/fs/nfs/fscache.c
index c817787fbdb4..24d1d1c5fcaf 100644
--- a/trunk/fs/nfs/fscache.c
+++ b/trunk/fs/nfs/fscache.c
@@ -307,6 +307,7 @@ void nfs_fscache_set_inode_cookie(struct inode *inode, struct file *filp)
 		nfs_fscache_inode_unlock(inode);
 	}
 }
+EXPORT_SYMBOL_GPL(nfs_fscache_set_inode_cookie);
 
 /*
  * Replace a per-inode cookie due to revalidation detecting a file having
diff --git a/trunk/fs/nfs/nfs4file.c b/trunk/fs/nfs/nfs4file.c
index e7699308364a..08ddcccb8887 100644
--- a/trunk/fs/nfs/nfs4file.c
+++ b/trunk/fs/nfs/nfs4file.c
@@ -5,6 +5,7 @@
  */
 #include <linux/nfs_fs.h>
 #include "internal.h"
+#include "fscache.h"
 #include "pnfs.h"
 
 #define NFSDBG_FACILITY		NFSDBG_FILE
@@ -74,6 +75,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
 
 	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
 	nfs_file_set_open_context(filp, ctx);
+	nfs_fscache_set_inode_cookie(inode, filp);
 	err = 0;
 
 out_put_ctx: