---

yaml --- r: 318867 b: refs/heads/master c: df57dbe h: refs/heads/master i: 318865: 4ad407c 318863: 0f86bff v: v3
git-mirror · Jul 23, 2012 · 2b0b937 · 2b0b937
1 parent c2025f6
commit 2b0b937
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 	}