Btrfs: make uncache_state unconditional
The extent_io code can take cached pointers into the extent state trees, and these can make lookups much faster in common operations. The caching only happens when specific bits are set that prevent merging and splitting of the extent state. A help function was added to uncache the state, and it was testing the same set of conditionals. This can leak in very strange corner cases where the lock bit goes away unexpectedly. The uncaching should be unconditional. Once we have a ref on the extent we should always give it up. Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
874d0d2633
commit
109b36a2bb
|
@ -694,12 +694,10 @@ static void uncache_state(struct extent_state **cached_ptr)
|
|||
{
|
||||
if (cached_ptr && (*cached_ptr)) {
|
||||
struct extent_state *state = *cached_ptr;
|
||||
if (state->state & (EXTENT_IOBITS | EXTENT_BOUNDARY)) {
|
||||
*cached_ptr = NULL;
|
||||
free_extent_state(state);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* set some bits on a range in the tree. This may require allocations or
|
||||
|
@ -1764,7 +1762,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err)
|
|||
|
||||
spin_lock(&tree->lock);
|
||||
state = find_first_extent_bit_state(tree, start, 0);
|
||||
if (state) {
|
||||
if (state && state->start == start) {
|
||||
/*
|
||||
* take a reference on the state, unlock will drop
|
||||
* the ref
|
||||
|
|
Loading…
Reference in New Issue