From 0933675e1007809161b758e6bb772a1a2c1e9eac Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Sun, 17 Sep 2023 15:01:38 -0400 Subject: [PATCH] LU-13814 osc: remove "osc_page_transfer_add" wrapper osc_page_transfer_add is just a wrapped around osc_lru_use, let's remove it to be more explicit about what we're actually doing. Test-Parameters: trivial Test-Parameters: testlist=sanity-sec env=ONLY=52,59a,59b Signed-off-by: Patrick Farrell Change-Id: I495a90bee7dc8f8c9d823fa47f9303d2fac2a829 --- lustre/osc/osc_page.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c index 472be44..550cb22 100644 --- a/lustre/osc/osc_page.c +++ b/lustre/osc/osc_page.c @@ -74,19 +74,6 @@ static void osc_page_transfer_put(const struct lu_env *env, } } -/** - * This is called once for every page when it is submitted for a transfer - * either opportunistic (osc_page_cache_add()), or immediate - * (osc_page_submit()). - */ -static void osc_page_transfer_add(const struct lu_env *env, - struct osc_page *opg, enum cl_req_type crt) -{ - struct osc_object *obj = osc_page_object(opg); - - osc_lru_use(osc_cli(obj), opg); -} - int osc_page_cache_add(const struct lu_env *env, struct osc_object *osc, struct osc_page *opg, struct cl_io *io, cl_commit_cbt cb) @@ -99,7 +86,7 @@ int osc_page_cache_add(const struct lu_env *env, struct osc_object *osc, if (result != 0) osc_page_transfer_put(env, opg); else - osc_page_transfer_add(env, opg, CRT_WRITE); + osc_lru_use(osc_cli(osc), opg); RETURN(result); } @@ -308,9 +295,10 @@ EXPORT_SYMBOL(osc_page_init); void osc_page_submit(const struct lu_env *env, struct osc_page *opg, enum cl_req_type crt, int brw_flags) { - struct osc_io *oio = osc_env_io(env); - struct osc_async_page *oap = &opg->ops_oap; + struct osc_object *obj = osc_page_object(opg); struct cl_page *page = opg->ops_cl.cpl_page; + struct osc_async_page *oap = &opg->ops_oap; + struct osc_io *oio = osc_env_io(env); LASSERT(oap->oap_async_flags & ASYNC_READY); LASSERT(oap->oap_async_flags & ASYNC_COUNT_STABLE); @@ -323,7 +311,7 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg, if (page->cp_type != CPT_TRANSIENT) osc_page_transfer_get(opg, "transfer\0imm"); - osc_page_transfer_add(env, opg, crt); + osc_lru_use(osc_cli(obj), opg); } /* --------------- LRU page management ------------------ */ -- 1.8.3.1