diff options
| author | Josef Bacik <jbacik@fb.com> | 2016-03-25 13:25:48 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-07-07 18:45:53 +0200 |
| commit | 25d609f86d6808eb1f0e8a6cafc3edb4a2b5ae35 (patch) | |
| tree | 24b8d9a911aa57675c5ade8f46028d32e77c521a /fs/btrfs/file.c | |
| parent | e40edf2da4fc6ab10c707b0522372b08b38171e6 (diff) | |
| download | linux-rt-25d609f86d6808eb1f0e8a6cafc3edb4a2b5ae35.tar.gz | |
Btrfs: fix callers of btrfs_block_rsv_migrate
So btrfs_block_rsv_migrate just unconditionally calls block_rsv_migrate_bytes.
Not only this but it unconditionally changes the size of the block_rsv. This
isn't a bug strictly speaking, but it makes truncate block rsv's look funny
because every time we migrate bytes over its size grows, even though we only
want it to be a specific size. So collapse this into one function that takes an
update_size argument and make truncate and evict not update the size for
consistency sake. Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 2234e88cf674..f3f61d1ad18a 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2479,7 +2479,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) } ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv, - min_size); + min_size, 0); BUG_ON(ret); trans->block_rsv = rsv; @@ -2522,7 +2522,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) } ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, - rsv, min_size); + rsv, min_size, 0); BUG_ON(ret); /* shouldn't happen */ trans->block_rsv = rsv; |