From 2b0b9379e17475b82626e5b7a0d56537cb6f3f51 Mon Sep 17 00:00:00 2001
From: Liu Bo <liubo2009@cn.fujitsu.com>
Date: Mon, 23 Jul 2012 05:50:03 -0600
Subject: [PATCH] --- yaml --- r: 318867 b: refs/heads/master c:
 df57dbe6bf73cc44305d81c24982a11da49b1f79 h: refs/heads/master i:   318865:
 4ad407c2991ab7a717f6cb0007c0c81bd7b5c7c0   318863:
 0f86bff2fa2c83386e45e4ce773d5752e0d96fab v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 135370bf0214..2a5b10d82d0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51561ffec9614618f3da362f9d1b03a95b717484
+refs/heads/master: df57dbe6bf73cc44305d81c24982a11da49b1f79
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 6621ed72f3c3..71b2d1c7da69 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -2581,8 +2581,10 @@ static noinline int check_delayed_ref(struct btrfs_trans_handle *trans,
 
 	node = rb_prev(node);
 	if (node) {
+		int seq = ref->seq;
+
 		ref = rb_entry(node, struct btrfs_delayed_ref_node, rb_node);
-		if (ref->bytenr == bytenr)
+		if (ref->bytenr == bytenr && ref->seq == seq)
 			goto out_unlock;
 	}