fuse: fix page invalidation

Other than truncate, there are two cases, when fuse tries to get rid
of cached pages:

 a) in open, if KEEP_CACHE flag is not set
 b) in getattr, if file size changed spontaneously

Until now invalidate_mapping_pages() were used, which didn't get rid
of mapped pages.  This is wrong, and becomes more wrong as dirty pages
are introduced.  So instead properly invalidate all pages with
invalidate_inode_pages2().

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 90ce7c5f7b593157bfffc4881bb57c691e687e84..fb1713e767563ba99a5135acb7d1c34f213a9ce2 100644 (file)
--- a/fs/fuse/file.c
+++ b/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/fs/fuse/inode.c b/fs/fuse/inode.c
index b584de33a6a71ec77495b373bc1a3ca40570b75e..e8d360add50a82dc679b4bfdf128f7ddb732d28b 100644 (file)
--- a/fs/fuse/inode.c
+++ b/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);
        }
 }