From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Wed, 28 May 2025 01:45:56 +0000 (-0400)
Subject: bcachefs: Catch data_update_done events in trace_io_move_start_fail
X-Git-Tag: v6.16-rc1~48^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=327971cef509c6380ed4bd8587fad26ceb2ab90b;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Catch data_update_done events in trace_io_move_start_fail

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 4dd779b7b6d27..857519cdac4ee 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -436,9 +436,6 @@ int bch2_move_extent(struct moving_context *ctxt,
 err_free:
 	kfree(io);
 err:
-	if (bch2_err_matches(ret, BCH_ERR_data_update_done))
-		return 0;
-
 	if (bch2_err_matches(ret, EROFS) ||
 	    bch2_err_matches(ret, BCH_ERR_transaction_restart))
 		return ret;
@@ -454,6 +451,9 @@ err:
 		trace_io_move_start_fail(c, buf.buf);
 		printbuf_exit(&buf);
 	}
+
+	if (bch2_err_matches(ret, BCH_ERR_data_update_done))
+		return 0;
 	return ret;
 }