diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-09 09:13:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-09 09:13:16 -0700 |
| commit | 1c91ffc896cf839a3a0923c0062ff61c930a21e0 (patch) | |
| tree | aa17696055c9a3176f3be3cfdda009e7b71922cc /fs/btrfs/locking.c | |
| parent | 6d5b5acca9e566515ef3f1ed617e7295c4f94345 (diff) | |
| parent | b9447ef80bd301b932ac4d85c9622e929de5fd62 (diff) | |
| download | linux-1c91ffc896cf839a3a0923c0062ff61c930a21e0.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix spinlock assertions on UP systems
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); } |