aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs/locking.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-07-22 11:18:08 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:05 -0400
commita61e6f29dc7c9d56a776a518eed92bbc61848263 (patch)
tree6856ad3e5822eacfc2ac94693b6023ef81567fd2 /fs/btrfs/locking.c
parent6af118ce51b52ceda357c671550c79628b9c4a65 (diff)
Btrfs: Use a mutex in the extent buffer for tree block locking
This replaces the use of the page cache lock bit for locking, which wasn't suitable for block size < page size and couldn't be used recursively. The mutexes alone don't fix either problem, but they are the first step. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/locking.c')
-rw-r--r--fs/btrfs/locking.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 058a506a0dd..01a9ac2be3f 100644
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -29,32 +29,31 @@ int btrfs_tree_lock(struct extent_buffer *eb)
{
int i;
- if (!TestSetPageLocked(eb->first_page))
+ if (mutex_trylock(&eb->mutex))
return 0;
for (i = 0; i < 512; i++) {
cpu_relax();
- if (!TestSetPageLocked(eb->first_page))
+ if (mutex_trylock(&eb->mutex))
return 0;
}
cpu_relax();
- lock_page(eb->first_page);
+ mutex_lock(&eb->mutex);
return 0;
}
int btrfs_try_tree_lock(struct extent_buffer *eb)
{
- return TestSetPageLocked(eb->first_page);
+ return mutex_trylock(&eb->mutex);
}
int btrfs_tree_unlock(struct extent_buffer *eb)
{
- WARN_ON(!PageLocked(eb->first_page));
- unlock_page(eb->first_page);
+ mutex_unlock(&eb->mutex);
return 0;
}
int btrfs_tree_locked(struct extent_buffer *eb)
{
- return PageLocked(eb->first_page);
+ return mutex_is_locked(&eb->mutex);
}