diff --git a/[refs] b/[refs] index 08b35c2300c4..4a7e81ee4a46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e00d2c2d4aead747d0fbee99001b00612d1082b0 +refs/heads/master: b10099792b6276c31cee4c021e0a5d3f9a9e33ed diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index 90ce7c5f7b59..fb1713e76756 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/fs/fuse/file.c @@ -87,7 +87,7 @@ void fuse_finish_open(struct inode *inode, struct file *file, if (outarg->open_flags & FOPEN_DIRECT_IO) file->f_op = &fuse_direct_io_file_operations; if (!(outarg->open_flags & FOPEN_KEEP_CACHE)) - invalidate_mapping_pages(inode->i_mapping, 0, -1); + invalidate_inode_pages2(inode->i_mapping); ff->fh = outarg->fh; file->private_data = fuse_file_get(ff); } diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c index b584de33a6a7..e8d360add50a 100644 --- a/trunk/fs/fuse/inode.c +++ b/trunk/fs/fuse/inode.c @@ -143,7 +143,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) if (S_ISREG(inode->i_mode) && oldsize != attr->size) { if (attr->size < oldsize) fuse_truncate(inode->i_mapping, attr->size); - invalidate_mapping_pages(inode->i_mapping, 0, -1); + invalidate_inode_pages2(inode->i_mapping); } }