diff options
Diffstat (limited to 'fs/9p')
-rw-r--r-- | fs/9p/v9fs_vfs.h | 2 | ||||
-rw-r--r-- | fs/9p/vfs_inode.c | 4 | ||||
-rw-r--r-- | fs/9p/vfs_super.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h index 32ef4009d030..3d056fe01b50 100644 --- a/fs/9p/v9fs_vfs.h +++ b/fs/9p/v9fs_vfs.h | |||
@@ -52,7 +52,7 @@ void v9fs_destroy_inode(struct inode *inode); | |||
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | struct inode *v9fs_get_inode(struct super_block *sb, int mode); | 54 | struct inode *v9fs_get_inode(struct super_block *sb, int mode); |
55 | void v9fs_clear_inode(struct inode *inode); | 55 | void v9fs_evict_inode(struct inode *inode); |
56 | ino_t v9fs_qid2ino(struct p9_qid *qid); | 56 | ino_t v9fs_qid2ino(struct p9_qid *qid); |
57 | void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *); | 57 | void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *); |
58 | int v9fs_dir_release(struct inode *inode, struct file *filp); | 58 | int v9fs_dir_release(struct inode *inode, struct file *filp); |
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 4b3ad6ac9a41..b81ce206508d 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -387,8 +387,10 @@ error: | |||
387 | * @inode: inode to release | 387 | * @inode: inode to release |
388 | * | 388 | * |
389 | */ | 389 | */ |
390 | void v9fs_clear_inode(struct inode *inode) | 390 | void v9fs_evict_inode(struct inode *inode) |
391 | { | 391 | { |
392 | truncate_inode_pages(inode->i_mapping, 0); | ||
393 | end_writeback(inode); | ||
392 | filemap_fdatawrite(inode->i_mapping); | 394 | filemap_fdatawrite(inode->i_mapping); |
393 | 395 | ||
394 | #ifdef CONFIG_9P_FSCACHE | 396 | #ifdef CONFIG_9P_FSCACHE |
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index be74d020436e..c6122bf547df 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
@@ -257,7 +257,7 @@ static const struct super_operations v9fs_super_ops = { | |||
257 | .destroy_inode = v9fs_destroy_inode, | 257 | .destroy_inode = v9fs_destroy_inode, |
258 | #endif | 258 | #endif |
259 | .statfs = simple_statfs, | 259 | .statfs = simple_statfs, |
260 | .clear_inode = v9fs_clear_inode, | 260 | .evict_inode = v9fs_evict_inode, |
261 | .show_options = generic_show_options, | 261 | .show_options = generic_show_options, |
262 | .umount_begin = v9fs_umount_begin, | 262 | .umount_begin = v9fs_umount_begin, |
263 | }; | 263 | }; |
@@ -268,7 +268,7 @@ static const struct super_operations v9fs_super_ops_dotl = { | |||
268 | .destroy_inode = v9fs_destroy_inode, | 268 | .destroy_inode = v9fs_destroy_inode, |
269 | #endif | 269 | #endif |
270 | .statfs = v9fs_statfs, | 270 | .statfs = v9fs_statfs, |
271 | .clear_inode = v9fs_clear_inode, | 271 | .evict_inode = v9fs_evict_inode, |
272 | .show_options = generic_show_options, | 272 | .show_options = generic_show_options, |
273 | .umount_begin = v9fs_umount_begin, | 273 | .umount_begin = v9fs_umount_begin, |
274 | }; | 274 | }; |