1 files changed, 16 insertions, 9 deletions

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 68bf2af6c389..3902bf43a088 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -32,6 +32,7 @@
 #include <linux/string.h>
 #include <linux/inet.h>
 #include <linux/list.h>
+#include <linux/pagemap.h>
 #include <asm/uaccess.h>
 #include <linux/idr.h>
 #include <net/9p/9p.h>
@@ -40,6 +41,7 @@
 #include "v9fs.h"
 #include "v9fs_vfs.h"
 #include "fid.h"
+#include "cache.h"
 
 static const struct file_operations v9fs_cached_file_operations;
 
@@ -72,7 +74,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
                         return err;
                 }
                 if (omode & P9_OTRUNC) {
-                        inode->i_size = 0;
+                        i_size_write(inode, 0);
                         inode->i_blocks = 0;
                 }
                 if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses)))
@@ -85,6 +87,10 @@ int v9fs_file_open(struct inode *inode, struct file *file)
                 /* enable cached file options */
                 if(file->f_op == &v9fs_file_operations)
                         file->f_op = &v9fs_cached_file_operations;
+
+#ifdef CONFIG_9P_FSCACHE
+                v9fs_cache_inode_set_cookie(inode, file);
+#endif
         }
 
         return 0;
@@ -210,6 +216,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
         struct p9_client *clnt;
         struct inode *inode = filp->f_path.dentry->d_inode;
         int origin = *offset;
+        unsigned long pg_start, pg_end;
 
         P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
                 (int)count, (int)*offset);
@@ -225,7 +232,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
                 if (count < rsize)
                         rsize = count;
 
-                n = p9_client_write(fid, NULL, data+total, *offset+total,
+                n = p9_client_write(fid, NULL, data+total, origin+total,
                                                                         rsize);
                 if (n <= 0)
                         break;
@@ -234,14 +241,14 @@ v9fs_file_write(struct file *filp, const char __user * data,
         } while (count > 0);
 
         if (total > 0) {
-                invalidate_inode_pages2_range(inode->i_mapping, origin,
-                                                                origin+total);
+                pg_start = origin >> PAGE_CACHE_SHIFT;
+                pg_end = (origin + total - 1) >> PAGE_CACHE_SHIFT;
+                if (inode->i_mapping && inode->i_mapping->nrpages)
+                        invalidate_inode_pages2_range(inode->i_mapping,
+                                                      pg_start, pg_end);
                 *offset += total;
-        }
-
-        if (*offset > inode->i_size) {
-                inode->i_size = *offset;
-                inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
+                i_size_write(inode, i_size_read(inode) + total);
+                inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
         }
 
         if (n < 0)