---

yaml --- r: 166682 b: refs/heads/master c: dd7e0b7 h: refs/heads/master v: v3
git-mirror · Sep 29, 2009 · 1e38f0c · 1e38f0c
1 parent 69279f7
commit 1e38f0c
Show file tree

Hide file tree

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