]> git.hungrycats.org Git - linux/commitdiff
btrfs: remove shadowing variables in __btrfs_buffered_write
authorDavid Sterba <dsterba@suse.cz>
Tue, 24 Feb 2015 18:07:26 +0000 (19:07 +0100)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 27 Mar 2015 01:21:45 +0000 (21:21 -0400)
There are lockstart and lockend defined in the function and not used
after their duplicate definition scope ends, it's safe to reuse them.

Signed-off-by: David Sterba <dsterba@suse.cz>
(cherry picked from commit f64c7b12f86c638f13e19de08eeb8cf888dff8f6)

fs/btrfs/file.c

index 1b4054ec6071b156c249addaa16f6dbd53b97573..0193268447353779586f3e83fbd664f24848286f 100644 (file)
@@ -1635,8 +1635,8 @@ again:
                        btrfs_end_nocow_write(root);
 
                if (only_release_metadata && copied > 0) {
-                       u64 lockstart = round_down(pos, root->sectorsize);
-                       u64 lockend = lockstart +
+                       lockstart = round_down(pos, root->sectorsize);
+                       lockend = lockstart +
                                (dirty_pages << PAGE_CACHE_SHIFT) - 1;
 
                        set_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,