diff options
| author |   David Sterba <dsterba@suse.cz> | 2015-02-24 19:45:15 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-03-03 17:24:35 +0100 |
| commit | 258ece02126a67af263746e1ae5f8ddf0d492e14 (patch) | |
| tree | 925c2ccfbad05c1e27f7bc9ad5495165aa35c2b3 /fs/btrfs/volumes.c | |
| parent | btrfs: switch helper macros to static inlines in sysfs.h (diff) | |
| download | linux-dev-258ece02126a67af263746e1ae5f8ddf0d492e14.tar.xz linux-dev-258ece02126a67af263746e1ae5f8ddf0d492e14.zip | |
btrfs: remove shadowing variables in __btrfs_map_block
1) We can safely use the function's 'i'. Fixes warning
fs/btrfs/volumes.c:5257:7: warning: declaration of 'i' shadows a previous local
fs/btrfs/volumes.c:4951:6: warning: shadowed declaration is here
2) A local variable duplicates name of an argument, we can use the value
directly. Fixes warning
fs/btrfs/volumes.c:5433:8: warning: declaration of 'length' shadows a parameter
fs/btrfs/volumes.c:4935:27: warning: shadowed declaration is here
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 3df83539f532..64ec2fd624da 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5262,7 +5262,6 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, need_raid_map && ((rw & (REQ_WRITE | REQ_GET_READ_MIRRORS)) || mirror_num > 1)) { u64 tmp; - int i; unsigned rot; bbio->raid_map = (u64 *)((void *)bbio->stripes + @@ -5438,9 +5437,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, } } if (found) { - u64 length = map->stripe_len; - - if (physical_of_found + length <= + if (physical_of_found + map->stripe_len <= dev_replace->cursor_left) { struct btrfs_bio_stripe *tgtdev_stripe = bbio->stripes + num_stripes; |