Commit 637d020a authored by Abhishek Kulkarni's avatar Abhishek Kulkarni Committed by Eric Van Hensbergen

9p: Fix the incorrect update of inode size in v9fs_file_write()

When using the cache=loose flags, the inode's size was not being
updated correctly on a remote write. Thus subsequent reads of
the whole file resulted in a truncated read. Fix it.
Signed-off-by: default avatarAbhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 7549ae3e
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/pagemap.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <net/9p/9p.h> #include <net/9p/9p.h>
...@@ -210,6 +211,7 @@ v9fs_file_write(struct file *filp, const char __user * data, ...@@ -210,6 +211,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
struct p9_client *clnt; struct p9_client *clnt;
struct inode *inode = filp->f_path.dentry->d_inode; struct inode *inode = filp->f_path.dentry->d_inode;
int origin = *offset; int origin = *offset;
unsigned long pg_start, pg_end;
P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data, P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
(int)count, (int)*offset); (int)count, (int)*offset);
...@@ -225,7 +227,7 @@ v9fs_file_write(struct file *filp, const char __user * data, ...@@ -225,7 +227,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
if (count < rsize) if (count < rsize)
rsize = count; rsize = count;
n = p9_client_write(fid, NULL, data+total, *offset+total, n = p9_client_write(fid, NULL, data+total, origin+total,
rsize); rsize);
if (n <= 0) if (n <= 0)
break; break;
...@@ -234,13 +236,12 @@ v9fs_file_write(struct file *filp, const char __user * data, ...@@ -234,13 +236,12 @@ v9fs_file_write(struct file *filp, const char __user * data,
} while (count > 0); } while (count > 0);
if (total > 0) { if (total > 0) {
invalidate_inode_pages2_range(inode->i_mapping, origin, pg_start = origin >> PAGE_CACHE_SHIFT;
origin+total); pg_end = (origin + total - 1) >> PAGE_CACHE_SHIFT;
invalidate_inode_pages2_range(inode->i_mapping, pg_start,
pg_end);
*offset += total; *offset += total;
} i_size_write(inode, i_size_read(inode) + total);
if (*offset > i_size_read(inode)) {
i_size_write(inode, *offset);
inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9; inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment