diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index b561e7a4007d3503d0941fbeb6a9f628ede51cef..b142b6dc96c3bee7c9535f941a73afba18808d66 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3637,7 +3637,11 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
 		 * start over after this.
 		 */
 
-		wait_event(ordered->wait, ordered->csum_bytes_left == 0);
+		if (ordered->csum_bytes_left) {
+			btrfs_start_ordered_extent(inode, ordered, 0);
+			wait_event(ordered->wait,
+				   ordered->csum_bytes_left == 0);
+		}
 
 		list_for_each_entry(sum, &ordered->list, list) {
 			ret = btrfs_csum_file_blocks(trans, log, sum);