diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index e962b0e25324858fb1d81750bb268407e1445ff7..d2cc16ff3e21df511ea7f3001e11a056a54f5ed9 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4882,7 +4882,7 @@ static int flush_space(struct btrfs_root *root,
 				     btrfs_get_alloc_profile(root, 0),
 				     CHUNK_ALLOC_NO_FORCE);
 		btrfs_end_transaction(trans, root);
-		if (ret == -ENOSPC)
+		if (ret > 0 || ret == -ENOSPC)
 			ret = 0;
 		break;
 	case COMMIT_TRANS: