Commit 4559b0a7 authored Jul 19, 2018 by Josef Bacik Committed by David Sterba Aug 06, 2018

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>

parent 84db5ccf

fs/btrfs/extent-tree.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4226,7 +4226,7 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes)
		data_sinfo->flags, bytes, 1);
		spin_unlock(&data_sinfo->lock);

		return ret;
		return 0;
		}

		int btrfs_check_data_free_space(struct inode *inode,