diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index cba98c1bcc0c11eff0fad32a7cf5a9fc3ac7c810..bea20feed2ab016340d841d43fc8f7f3b3597c4b 100644
--- a/fs/btrfs/extent-tree.c
+++ b/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);
 	}
 }