Merge branch 'raid56-experimental' into for-linus-3.9

Signed-off-by: Chris Mason <chris.mason@fusionio.com>

Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/extent-tree.c
	fs/btrfs/inode.c
	fs/btrfs/volumes.c

1 files changed, 9 insertions, 0 deletions

diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index 7939149f8f27..f75fcaf79aeb 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -132,6 +132,15 @@ struct btrfs_delayed_ref_root {
         unsigned long num_heads_ready;
 
         /*
+         * bumped when someone is making progress on the delayed
+         * refs, so that other procs know they are just adding to
+         * contention intead of helping
+         */
+        atomic_t procs_running_refs;
+        atomic_t ref_seq;
+        wait_queue_head_t wait;
+
+        /*
          * set when the tree is flushing before a transaction commit,
          * used by the throttling code to decide if new updates need
          * to be run right away