From ccfcad13f5ba550b7bd7f6b7b242b40340801da7 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 4 Sep 2023 20:10:40 -0400 Subject: [PATCH] LU-13814 osc: rename osc_prep_async_page This is another piece of renaming osc_async_page to osc_transfer_page. This is kept separate to make the previous patch as focused as possible. Test-Parameters: trivial Test-Parameters: forjanitoronly Signed-off-by: Patrick Farrell Change-Id: Ifd57eec46aeeb059ac836e09aa47322a69cc1493 --- lustre/include/lustre_osc.h | 4 ++-- lustre/osc/osc_cache.c | 6 +++--- lustre/osc/osc_page.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h index f7c75e4..7f5ec97 100644 --- a/lustre/include/lustre_osc.h +++ b/lustre/include/lustre_osc.h @@ -568,8 +568,8 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli, /* osc_cache.c */ int osc_set_async_flags(struct osc_object *obj, struct osc_page *opg, u32 async_flags); -int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, - struct cl_page *page, loff_t offset); +int osc_prep_transfer_page(struct osc_object *osc, struct osc_page *ops, + struct cl_page *page, loff_t offset); int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, struct osc_object *osc, struct osc_page *ops, cl_commit_cbt cb); diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c index 8ef433d..5089c70 100644 --- a/lustre/osc/osc_cache.c +++ b/lustre/osc/osc_cache.c @@ -2221,8 +2221,8 @@ int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli, } EXPORT_SYMBOL(osc_io_unplug0); -int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, - struct cl_page *page, loff_t offset) +int osc_prep_transfer_page(struct osc_object *osc, struct osc_page *ops, + struct cl_page *page, loff_t offset) { struct osc_transfer_page *otp = &ops->ops_otp; @@ -2252,7 +2252,7 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, otp, otp->otp_page, otp->otp_obj_off); RETURN(0); } -EXPORT_SYMBOL(osc_prep_async_page); +EXPORT_SYMBOL(osc_prep_transfer_page); int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, struct osc_object *osc, struct osc_page *ops, diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c index 21dc3d0..9b46fd9 100644 --- a/lustre/osc/osc_page.c +++ b/lustre/osc/osc_page.c @@ -251,7 +251,8 @@ int osc_page_init(const struct lu_env *env, struct cl_io *io, INIT_LIST_HEAD(&opg->ops_lru); - result = osc_prep_async_page(osc, opg, cl_page, index << PAGE_SHIFT); + result = osc_prep_transfer_page(osc, opg, cl_page, + index << PAGE_SHIFT); if (result != 0) return result; -- 1.8.3.1