lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: don't use spin_is_contended

Browse Source 
Btrfs was using spin_is_contended to see if it should drop locks before
doing extent allocations during btrfs_search_slot.  The idea was to avoid
expensive searches in the tree unless the lock was actually contended.

But, spin_is_contended is specific to the ticket spinlocks on x86, so this
is causing compile errors everywhere else.

In practice, the contention could easily appear some time after we started
doing the extent allocation, and it makes more sense to always drop the lock
instead.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2009-02-09 16:22:03 -05:00
parent 42f15d77df
commit 284b066af4
3 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/ctree.c
View File

@ -1530,8 +1530,7 @@ again:
* for higher level blocks, try not to allocate blocks
* with the block and the parent locks held.
*/
if (level > 0 && !prealloc_block.objectid &&
btrfs_path_lock_waiting(p, level)) {
if (level > 0 && !prealloc_block.objectid) {
u32 size = b->len;
u64 hint = b->start;