diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:05:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:05:58 -0400 |
commit | 9d8190f87b5458160ba75d05e8ad6abefbe48a26 (patch) | |
tree | 7abeb91aa2a40b91004f53520b7bf1f2c80aab7e /fs/9p/vfs_file.c | |
parent | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (diff) | |
parent | 982c37cfb6e61c0e64634abc2e305d757c1405b2 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: remove sysctl
9p: fix bad kconfig cross-dependency
9p: soften invalidation in loose_mode
9p: attach-per-user
9p: rename uid and gid parameters
9p: define session flags
9p: Make transports dynamic
Diffstat (limited to 'fs/9p/vfs_file.c')
-rw-r--r-- | fs/9p/vfs_file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 716691689fd5..ba4b1caa9c43 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
@@ -162,15 +162,17 @@ v9fs_file_write(struct file *filp, const char __user * data, | |||
162 | 162 | ||
163 | fid = filp->private_data; | 163 | fid = filp->private_data; |
164 | ret = p9_client_uwrite(fid, data, *offset, count); | 164 | ret = p9_client_uwrite(fid, data, *offset, count); |
165 | if (ret > 0) | 165 | if (ret > 0) { |
166 | invalidate_inode_pages2_range(inode->i_mapping, *offset, | ||
167 | *offset+ret); | ||
166 | *offset += ret; | 168 | *offset += ret; |
169 | } | ||
167 | 170 | ||
168 | if (*offset > inode->i_size) { | 171 | if (*offset > inode->i_size) { |
169 | inode->i_size = *offset; | 172 | inode->i_size = *offset; |
170 | inode->i_blocks = (inode->i_size + 512 - 1) >> 9; | 173 | inode->i_blocks = (inode->i_size + 512 - 1) >> 9; |
171 | } | 174 | } |
172 | 175 | ||
173 | invalidate_inode_pages2(inode->i_mapping); | ||
174 | return ret; | 176 | return ret; |
175 | } | 177 | } |
176 | 178 | ||