diff --git a/[refs] b/[refs] index 63077f4b835f..1b223bf5bacc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a09a0a705dd6c80bc96b5e6f18dc103d4e1a7d63 +refs/heads/master: d340d2475c6e394013325f83f499594628a9e558 diff --git a/trunk/fs/btrfs/locking.h b/trunk/fs/btrfs/locking.h index ca52681e5f40..b81e0e9a4894 100644 --- a/trunk/fs/btrfs/locking.h +++ b/trunk/fs/btrfs/locking.h @@ -26,7 +26,6 @@ void btrfs_tree_lock(struct extent_buffer *eb); void btrfs_tree_unlock(struct extent_buffer *eb); -int btrfs_try_spin_lock(struct extent_buffer *eb); void btrfs_tree_read_lock(struct extent_buffer *eb); void btrfs_tree_read_unlock(struct extent_buffer *eb);