aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2011-02-28 17:04:04 +0530
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-15 09:57:40 -0500
commitfa6ea16160c72c448e2728dab4b6b0a133fdfc98 (patch)
tree51c9ad37c30aeb02bc34a67ca499a0492b06959e /fs/9p
parent6b365604ca8c1b67f0d5a816cf5acf2dc3edc229 (diff)
downloadkernel_samsung_smdk4412-fa6ea16160c72c448e2728dab4b6b0a133fdfc98.zip
kernel_samsung_smdk4412-fa6ea16160c72c448e2728dab4b6b0a133fdfc98.tar.gz
kernel_samsung_smdk4412-fa6ea16160c72c448e2728dab4b6b0a133fdfc98.tar.bz2
fs/9p: Fix inode i_size update in file_write
Only update inode i_size when we write towards end of file. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_file.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 98c4307..3cff25e 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -440,6 +440,7 @@ v9fs_file_write_internal(struct inode *inode, struct p9_fid *fid,
loff_t *offset, int invalidate)
{
int n;
+ loff_t i_size;
size_t total = 0;
struct p9_client *clnt;
loff_t origin = *offset;
@@ -464,8 +465,11 @@ v9fs_file_write_internal(struct inode *inode, struct p9_fid *fid,
invalidate_inode_pages2_range(inode->i_mapping,
pg_start, pg_end);
*offset += total;
- i_size_write(inode, i_size_read(inode) + total);
- inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
+ i_size = i_size_read(inode);
+ if (*offset > i_size) {
+ inode_add_bytes(inode, *offset - i_size);
+ i_size_write(inode, *offset);
+ }
}
if (n < 0)
return n;