diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-03-09 11:45:38 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-03-09 11:45:38 -0400 |
| commit | b9447ef80bd301b932ac4d85c9622e929de5fd62 (patch) | |
| tree | 6d0bb1f287ed09f7850b77e2f622c3bebb35112b /fs/btrfs/locking.c | |
| parent | 4e06bdd6cbd5105376e7caf4e683ed131e777389 (diff) | |
| download | talos-op-linux-b9447ef80bd301b932ac4d85c9622e929de5fd62.tar.gz talos-op-linux-b9447ef80bd301b932ac4d85c9622e929de5fd62.zip | |
Btrfs: fix spinlock assertions on UP systems
btrfs_tree_locked was being used to make sure a given extent_buffer was
properly locked in a few places. But, it wasn't correct for UP compiled
kernels.
This switches it to using assert_spin_locked instead, and renames it to
btrfs_assert_tree_locked to better reflect how it was really being used.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/locking.c')
| -rw-r--r-- | fs/btrfs/locking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 85506c4a3af7..47b0a88c12a2 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -220,8 +220,8 @@ int btrfs_tree_unlock(struct extent_buffer *eb) return 0; } -int btrfs_tree_locked(struct extent_buffer *eb) +void btrfs_assert_tree_locked(struct extent_buffer *eb) { - return test_bit(EXTENT_BUFFER_BLOCKING, &eb->bflags) || - spin_is_locked(&eb->lock); + if (!test_bit(EXTENT_BUFFER_BLOCKING, &eb->bflags)) + assert_spin_locked(&eb->lock); } |
