]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: fix lost return value due to variable shadowing
authorDavid Sterba <dsterba@suse.cz>
Tue, 24 Feb 2015 17:57:18 +0000 (18:57 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Wed, 18 Mar 2015 15:06:13 +0000 (15:06 +0000)
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: d187663ef24c ("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: Luis Henriques <luis.henriques@canonical.com>
fs/btrfs/inode.c

index a3a8dee8030fd2ee49f7fb5426f21a1afd212293..670f942e223515fcabf47cbc4d9fc8ad68cefa79 100644 (file)
@@ -7000,7 +7000,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))