Skip to content

Commit

Permalink
Btrfs: Remove broken sanity check from btrfs_rmap_block()
Browse files Browse the repository at this point in the history
It was never actually doing anything anyway (see the loop condition),
and it would be difficult to make it work for RAID[56].

Even if it was actually working, it's checking for the wrong thing
anyway. Instead of checking whether we list a block which _doesn't_ land
at the relevant physical location, it should be checking that we _have_
listed all the logical blocks which refer to the required physical
location on all devices.

This function is only called from remove_sb_from_cache() to ensure that
we reserve the logical blocks which would reside at the same physical
location as the superblock copies. So listing more blocks than we need
is actually OK.

With RAID[56] we're going to throw away an entire stripe for each block
we have to ignore, so we _are_ going to list blocks other than the
ones which actually contain the superblock.

Signed-off-by: David Woodhouse <[email protected]>
Signed-off-by: Chris Mason <[email protected]>
  • Loading branch information
dwmw2 authored and chrismason-xx committed Jul 22, 2009
1 parent 29c5e8c commit 3acada4
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2795,26 +2795,6 @@ int btrfs_rmap_block(struct btrfs_mapping_tree *map_tree,
}
}

for (i = 0; i > nr; i++) {
struct btrfs_multi_bio *multi;
struct btrfs_bio_stripe *stripe;
int ret;

length = 1;
ret = btrfs_map_block(map_tree, WRITE, buf[i],
&length, &multi, 0);
BUG_ON(ret);

stripe = multi->stripes;
for (j = 0; j < multi->num_stripes; j++) {
if (stripe->physical >= physical &&
physical < stripe->physical + length)
break;
}
BUG_ON(j >= multi->num_stripes);
kfree(multi);
}

*logical = buf;
*naddrs = nr;
*stripe_len = map->stripe_len;
Expand Down

0 comments on commit 3acada4

Please sign in to comment.