From 1e38f0c6c74ed0e625b600ff10fd617a8a393a29 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 29 Sep 2009 18:38:44 -0400
Subject: [PATCH] --- yaml --- r: 166682 b: refs/heads/master c:
 dd7e0b7b02ccff73b87032e20fc5b4f2c1cfcc14 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c8528bcf37dc..01464d9209ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ab86aedbc7845a946b4ba4edf37762629970708
+refs/heads/master: dd7e0b7b02ccff73b87032e20fc5b4f2c1cfcc14
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index a4b2b03cd682..d119c0388af1 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -3168,7 +3168,7 @@ int btrfs_check_data_free_space(struct btrfs_root *root, struct inode *inode,
 		spin_unlock(&data_sinfo->lock);
 
 		/* commit the current transaction and try again */
-		if (!committed) {
+		if (!committed && !root->fs_info->open_ioctl_trans) {
 			committed = 1;
 			trans = btrfs_join_transaction(root, 1);
 			if (!trans)