From 112687029aeb84b4e473f534e24ae19bc520c39d Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Mon, 18 Jun 2012 07:23:18 -0600
Subject: [PATCH] --- yaml --- r: 311183 b: refs/heads/master c:
 e18fca734278784bd6591de63ca148cc27344ca9 h: refs/heads/master i:   311181:
 df23228235ded05dcb8d3bc01213d1f52e509598   311179:
 8c550a70647def077b372ce8b70d9d909a14f6b5   311175:
 f39e8e2a2e7a3de86299d29cc250bf8f2ff625bb   311167:
 844235c4a4c330b76011b57f0128090c46fa6bce v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4bc5c9cfd544..c78e07e9bf45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69bca40d41c613927b150c5392505f1894fe3010
+refs/heads/master: e18fca734278784bd6591de63ca148cc27344ca9
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index e22c5bbf0223..7d7bc8eace86 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -3426,6 +3426,7 @@ int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
 				mutex_unlock(&head->mutex);
 				btrfs_put_delayed_ref(ref);
 
+				spin_lock(&delayed_refs->lock);
 				continue;
 			}