---

yaml --- r: 374848 b: refs/heads/master c: 98ad69c h: refs/heads/master v: v3
git-mirror · May 6, 2013 · 824a83c · 824a83c
1 parent 1ecfc74
commit 824a83c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c579fe745d96d0841c28295c10ac3e427cef9f2
+refs/heads/master: 98ad69cfd2ca8e27250af839bacda1639a7dc3a4
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -3920,7 +3920,8 @@ void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root,
 		 * the disk).
 		 */
 		btrfs_start_delalloc_inodes(root, 0);
-		btrfs_wait_ordered_extents(root, 0);
+		if (!current->journal_info)
+			btrfs_wait_ordered_extents(root, 0);
 	}
 }