From 16f314c95cab7ec81ecb9187ce83f49c3c479fea Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Fri, 23 Feb 2024 11:19:59 -0500 Subject: [PATCH] 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. Signed-off-by: Patrick Farrell Change-Id: Ic288717c8487ff963f0fa7f63a943e72d05d129a Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52084 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Qian Yingjin Reviewed-by: Sebastien Buisson --- lustre/obdclass/cl_page.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index 985b424..f53ea2d 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -940,21 +940,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) { -- 1.8.3.1