Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[mirror_ubuntu-bionic-kernel.git] / fs / nfs / nfs4file.c

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index e7699308364acf6f84fcf62e5f815ed2c74c2b5c..13e6bb3e3fe59c03b1430f118a2afd4033c19a1d 100644 (file)
--- a/fs/nfs/nfs4file.c
+++ b/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:
@@ -92,7 +94,7 @@ static int
 nfs4_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
        int ret;
-       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode *inode = file_inode(file);
 
        do {
                ret = filemap_write_and_wait_range(inode->i_mapping, start, end);