From 38ecf50bfcdb2e5ab2d49886943206cdcac8804b Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Sat, 28 Oct 2023 13:48:04 -0400 Subject: [PATCH] EX-7601 ofd: rename 'local' in thread_big_cache It's not a big deal since it's only used a few times, but let's give this variable a descriptive name. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Ide136cd42e885d59f1a2e4ce22a2e7449faca3f9 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52874 Tested-by: jenkins Tested-by: Andreas Dilger Reviewed-by: Andreas Dilger Reviewed-by: Artem Blagodarenko --- lustre/include/obd.h | 2 +- lustre/ofd/ofd_dev.c | 2 +- lustre/target/tgt_handler.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 9018262..c16f62e 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -481,7 +481,7 @@ void unmerge_chunk(struct brw_page **pga, struct niobuf_local *lnb, int first, int count, char *merged, unsigned int size); struct tgt_thread_big_cache { - struct niobuf_local local[PTLRPC_MAX_BRW_PAGES]; + struct niobuf_local tbc_lnb[PTLRPC_MAX_BRW_PAGES]; }; #define LUSTRE_FLD_NAME "fld" diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c index c0eb9fb..d7a1ccaf 100644 --- a/lustre/ofd/ofd_dev.c +++ b/lustre/ofd/ofd_dev.c @@ -2342,7 +2342,7 @@ static int ofd_ladvise_hdl(struct tgt_session_info *tsi) break; req->rq_status = ofd_ladvise_prefetch(env, fo, - tbc->local, + tbc->tbc_lnb, start, end, dbt); tgt_data_unlock(&lockh, LCK_PR); break; diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c index 19a6787..a1f9501 100644 --- a/lustre/target/tgt_handler.c +++ b/lustre/target/tgt_handler.c @@ -2373,7 +2373,7 @@ int tgt_brw_read(struct tgt_session_info *tsi) remote_nb = req_capsule_client_get(&req->rq_pill, &RMF_NIOBUF_REMOTE); LASSERT(remote_nb != NULL); /* must exists after tgt_ost_body_unpack */ - local_nb = tbc->local; + local_nb = tbc->tbc_lnb; rc = tgt_brw_lock(tsi->tsi_env, exp, &tsi->tsi_resid, ioo, remote_nb, &lockh, LCK_PR); @@ -2748,7 +2748,7 @@ int tgt_brw_write(struct tgt_session_info *tsi) CFS_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_PACK, cfs_fail_val); rcs = req_capsule_server_get(&req->rq_pill, &RMF_RCS); - local_nb = tbc->local; + local_nb = tbc->tbc_lnb; rc = tgt_brw_lock(tsi->tsi_env, exp, &tsi->tsi_resid, ioo, remote_nb, &lockh, LCK_PW); -- 1.8.3.1