From: Patrick Farrell <pfarrell@whamcloud.com>
Date: Sun, 17 Sep 2023 19:00:52 +0000 (-0400)
Subject: LU-13814 clio: cleanup cl_page_completion
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d229c326cc81c28fc7f82f105cc34a4c633a8294;p=fs%2Flustre-release.git

LU-13814 clio: cleanup cl_page_completion

Clean up cl_page_completion and make very explicit which
parts of the function do not apply to transient pages.

Test-Parameters: forjanitoronly
Test-Parameters: fortestonly
Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: Ic288717c8487ff963f0fa7f63a943e72d05d129a
---

diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c
index c6396c9..996ad97 100644
--- a/lustre/obdclass/cl_page.c
+++ b/lustre/obdclass/cl_page.c
@@ -968,21 +968,21 @@ void cl_page_completion(const struct lu_env *env,
 	int i;
 
         ENTRY;
+
+	CL_PAGE_HEADER(D_TRACE, env, cl_page, "%d %d\n", crt, ioret);
 	PASSERT(env, cl_page, crt < CRT_NR);
-	if (cl_page->cp_type != CPT_TRANSIENT)
+
+	if (cl_page->cp_type != CPT_TRANSIENT) {
 		PASSERT(env, cl_page,
 			cl_page->cp_state == cl_req_type_state(crt));
-
-	CL_PAGE_HEADER(D_TRACE, env, cl_page, "%d %d\n", crt, ioret);
-	if (cl_page->cp_type != CPT_TRANSIENT)
 		cl_page_state_set(env, cl_page, CPS_CACHED);
-	if (crt >= CRT_NR)
-		return;
 
-	cl_page_slice_for_each_reverse(cl_page, slice, i) {
-		if (slice->cpl_ops->io[crt].cpo_completion != NULL)
-			(*slice->cpl_ops->io[crt].cpo_completion)(env, slice,
-								  ioret);
+		cl_page_slice_for_each_reverse(cl_page, slice, i) {
+			if (slice->cpl_ops->io[crt].cpo_completion != NULL)
+				(*slice->cpl_ops->io[crt].cpo_completion)(env,
+									  slice,
+									 ioret);
+		}
 	}
 
 	if (anchor != NULL) {