btrfs: fix lost return value due to variable shadowing (1932b7be) · Commits · 戴 / test

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. CC: <stable@vger.kernel.org> # 3.6+ Fixes: ("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>

fs/btrfs/inode.c

+0 −1

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

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

Admin message