diff options
author | David Sterba <dsterba@suse.cz> | 2011-04-19 08:31:08 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-05-02 07:57:19 -0400 |
commit | edc95aec57661c8e568e18f6c3f002aefa07ebc8 (patch) | |
tree | a3f2570fb6aa53f89eb7a453bd3435dff4c3ba8d /fs/btrfs | |
parent | 306e16ce13c0f3d4fc071b45803b5b83c2606011 (diff) |
btrfs: remove nested duplicate variable declarations
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/ctree.c | 1 | ||||
-rw-r--r-- | fs/btrfs/free-space-cache.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 84d7ca1fe0ba..c60197b36bc8 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -3647,7 +3647,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans, | |||
3647 | 3647 | ||
3648 | ret = 0; | 3648 | ret = 0; |
3649 | if (slot == 0) { | 3649 | if (slot == 0) { |
3650 | struct btrfs_disk_key disk_key; | ||
3651 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); | 3650 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
3652 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); | 3651 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); |
3653 | } | 3652 | } |
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 63731a1fb0a1..9e69c6b8409c 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
@@ -1910,8 +1910,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, | |||
1910 | while(1) { | 1910 | while(1) { |
1911 | if (entry->bytes < bytes || | 1911 | if (entry->bytes < bytes || |
1912 | (!entry->bitmap && entry->offset < min_start)) { | 1912 | (!entry->bitmap && entry->offset < min_start)) { |
1913 | struct rb_node *node; | ||
1914 | |||
1915 | node = rb_next(&entry->offset_index); | 1913 | node = rb_next(&entry->offset_index); |
1916 | if (!node) | 1914 | if (!node) |
1917 | break; | 1915 | break; |
@@ -1925,7 +1923,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, | |||
1925 | cluster, entry, bytes, | 1923 | cluster, entry, bytes, |
1926 | min_start); | 1924 | min_start); |
1927 | if (ret == 0) { | 1925 | if (ret == 0) { |
1928 | struct rb_node *node; | ||
1929 | node = rb_next(&entry->offset_index); | 1926 | node = rb_next(&entry->offset_index); |
1930 | if (!node) | 1927 | if (!node) |
1931 | break; | 1928 | break; |