Commit d771f1d4 authored Feb 24, 2015 by David Sterba Committed by Sasha Levin Mar 14, 2015

btrfs: fix lost return value due to variable shadowing



commit 1932b7be973b554ffe20a5bba6ffaed6fa995cdc upstream.

A block-local variable stores error code but btrfs_get_blocks_direct may
not return it in the end as there's a ret defined in the function scope.

Fixes: d187663e ("Btrfs: lock extents as we map them in DIO")
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 67b67dfa

fs/btrfs/inode.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -7151,7 +7151,6 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
		((BTRFS_I(inode)->flags & BTRFS_INODE_NODATACOW) &&
		em->block_start != EXTENT_MAP_HOLE)) {
		int type;
		int ret;
		u64 block_start, orig_start, orig_block_len, ram_bytes;

		if (test_bit(EXTENT_FLAG_PREALLOC, &em->flags))