diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-02-10 00:22:03 +0300 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-02-10 00:22:03 +0300 |
| commit | 284b066af41579f62649048fdec5c5e7091703e6 (patch) | |
| tree | e34185c911cb50b0ade04f804056ffbe2a6e04ae /fs/btrfs/ctree.c | |
| parent | 42f15d77df8a7e8a2feb15041d5d30710ee7f951 (diff) | |
| download | linux-284b066af41579f62649048fdec5c5e7091703e6.tar.xz | |
Btrfs: don't use spin_is_contended
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>
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 551177c0011a..35443cc4b9a9 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -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; |