43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
|
|
--- a/fs/fuse/dir.c
|
|
+++ b/fs/fuse/dir.c
|
|
@@ -2280,6 +2280,9 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
|
|
*/
|
|
if ((is_truncate || !is_wb) &&
|
|
S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) {
|
|
+ if (outarg.attr.size > oldsize)
|
|
+ truncate_pagecache_range(inode, oldsize,
|
|
+ outarg.attr.size - 1);
|
|
truncate_pagecache(inode, outarg.attr.size);
|
|
invalidate_inode_pages2(mapping);
|
|
}
|
|
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
|
|
--- a/fs/fuse/file.c
|
|
+++ b/fs/fuse/file.c
|
|
@@ -1360,9 +1360,13 @@ static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)
|
|
struct fuse_conn *fc = get_fuse_conn(inode);
|
|
struct fuse_inode *fi = get_fuse_inode(inode);
|
|
loff_t pos = iocb->ki_pos;
|
|
+ loff_t old_size = i_size_read(inode);
|
|
int err = 0;
|
|
ssize_t res = 0;
|
|
|
|
+ if (pos > old_size)
|
|
+ truncate_pagecache_range(inode, old_size, pos - 1);
|
|
+
|
|
if (inode->i_size < pos + iov_iter_count(ii))
|
|
set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
|
|
|
|
@@ -2908,6 +2912,11 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
|
|
|
|
/* we could have extended the file */
|
|
if (!(mode & FALLOC_FL_KEEP_SIZE)) {
|
|
+ loff_t oldsize = i_size_read(inode);
|
|
+
|
|
+ if (offset + length > oldsize)
|
|
+ truncate_pagecache_range(inode, oldsize,
|
|
+ offset + length - 1);
|
|
if (fuse_write_update_attr(inode, offset + length, length))
|
|
file_update_time(file);
|
|
}
|