summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2018-07-19 10:49:51 -0400
committerDavid Sterba <dsterba@suse.com>2018-08-06 13:12:59 +0200
commit4559b0a71749c442d34f7cfb9e72c9e58db83948 (patch)
treeba2c64c3767bf6cdfac0a1008c40efed4b72f8bc /fs/btrfs
parent84db5ccf4262894852e0d178d250678945d9b0b8 (diff)
downloadlinux-stable-4559b0a71749c442d34f7cfb9e72c9e58db83948.tar.gz
linux-stable-4559b0a71749c442d34f7cfb9e72c9e58db83948.tar.bz2
linux-stable-4559b0a71749c442d34f7cfb9e72c9e58db83948.zip
btrfs: don't leak ret from do_chunk_alloc
If we're trying to make a data reservation and we have to allocate a data chunk we could leak ret == 1, as do_chunk_alloc() will return 1 if it allocated a chunk. Since the end of the function is the success path just return 0. CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 16b916a33e56..2eb2d7ac0ba4 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4226,7 +4226,7 @@ commit_trans:
data_sinfo->flags, bytes, 1);
spin_unlock(&data_sinfo->lock);
- return ret;
+ return 0;
}
int btrfs_check_data_free_space(struct inode *inode,