diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (patch) | |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 /fs/btrfs/locking.h | |
| parent | 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/acpi/boot.c
Diffstat (limited to 'fs/btrfs/locking.h')
| -rw-r--r-- | fs/btrfs/locking.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h index d92e707f5870..6bb0afbff928 100644 --- a/fs/btrfs/locking.h +++ b/fs/btrfs/locking.h | |||
| @@ -26,8 +26,6 @@ int btrfs_tree_locked(struct extent_buffer *eb); | |||
| 26 | int btrfs_try_tree_lock(struct extent_buffer *eb); | 26 | int btrfs_try_tree_lock(struct extent_buffer *eb); |
| 27 | int btrfs_try_spin_lock(struct extent_buffer *eb); | 27 | int btrfs_try_spin_lock(struct extent_buffer *eb); |
| 28 | 28 | ||
| 29 | int btrfs_path_lock_waiting(struct btrfs_path *path, int level); | ||
| 30 | |||
| 31 | void btrfs_set_lock_blocking(struct extent_buffer *eb); | 29 | void btrfs_set_lock_blocking(struct extent_buffer *eb); |
| 32 | void btrfs_clear_lock_blocking(struct extent_buffer *eb); | 30 | void btrfs_clear_lock_blocking(struct extent_buffer *eb); |
| 33 | #endif | 31 | #endif |