Merge commit 'v2.6.29-rc4' into x86/cleanups

[linux-2.6-omap-h63xx.git] / fs / btrfs / locking.h

diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h
index bc1faef12519451294e361becacbd9f404ac0afd..d92e707f5870c1dfb13462298047b58c8827f622 100644 (file)
--- a/fs/btrfs/locking.h
+++ b/fs/btrfs/locking.h
@@ -22,6 +22,12 @@
 int btrfs_tree_lock(struct extent_buffer *eb);
 int btrfs_tree_unlock(struct extent_buffer *eb);
 int btrfs_tree_locked(struct extent_buffer *eb);
+
 int btrfs_try_tree_lock(struct extent_buffer *eb);
+int btrfs_try_spin_lock(struct extent_buffer *eb);
+
 int btrfs_path_lock_waiting(struct btrfs_path *path, int level);
+
+void btrfs_set_lock_blocking(struct extent_buffer *eb);
+void btrfs_clear_lock_blocking(struct extent_buffer *eb);
 #endif