aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/free-space-cache.c4
-rw-r--r--fs/btrfs/inode.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index ef3bea7bb257..3f0ddfce96e6 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -221,12 +221,10 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
221 struct btrfs_path *path, 221 struct btrfs_path *path,
222 struct inode *inode) 222 struct inode *inode)
223{ 223{
224 loff_t oldsize;
225 int ret = 0; 224 int ret = 0;
226 225
227 oldsize = i_size_read(inode);
228 btrfs_i_size_write(inode, 0); 226 btrfs_i_size_write(inode, 0);
229 truncate_pagecache(inode, oldsize, 0); 227 truncate_pagecache(inode, 0);
230 228
231 /* 229 /*
232 * We don't need an orphan item because truncating the free space cache 230 * We don't need an orphan item because truncating the free space cache
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index db1e43948579..f338c5672d58 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4349,7 +4349,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
4349 inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb); 4349 inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
4350 4350
4351 if (newsize > oldsize) { 4351 if (newsize > oldsize) {
4352 truncate_pagecache(inode, oldsize, newsize); 4352 truncate_pagecache(inode, newsize);
4353 ret = btrfs_cont_expand(inode, oldsize, newsize); 4353 ret = btrfs_cont_expand(inode, oldsize, newsize);
4354 if (ret) 4354 if (ret)
4355 return ret; 4355 return ret;