| From 1932b7be973b554ffe20a5bba6ffaed6fa995cdc Mon Sep 17 00:00:00 2001 |
| From: David Sterba <dsterba@suse.cz> |
| Date: Tue, 24 Feb 2015 18:57:18 +0100 |
| Subject: btrfs: fix lost return value due to variable shadowing |
| |
| From: David Sterba <dsterba@suse.cz> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/btrfs/inode.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/fs/btrfs/inode.c |
| +++ b/fs/btrfs/inode.c |
| @@ -7208,7 +7208,6 @@ static int btrfs_get_blocks_direct(struc |
| ((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)) |
