From 3252f4448966831db705acfc3e74bab8ea3c6cca Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Thu, 21 Sep 2023 12:09:57 -0400 Subject: [PATCH] EX-8270 ptlrpc: rename max_pools to max_ptr_pages Continue removal of referring to page pointers as pools with another rename. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: I14796f670a7f06fbec3b40ec23b4dd2e50f22d46 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52459 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/ptlrpc/sec_bulk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c index e15f2ee..c9d339e 100644 --- a/lustre/ptlrpc/sec_bulk.c +++ b/lustre/ptlrpc/sec_bulk.c @@ -78,7 +78,7 @@ MODULE_PARM_DESC(pool_max_memory_mb, static struct ptlrpc_page_pool { unsigned long ppp_max_pages; /* maximum pages can hold, const */ - unsigned int ppp_max_pools; /* number of pools, const */ + unsigned int ppp_max_ptr_pages; /* number of pools, const */ /* * wait queue in case of not enough free pages. @@ -169,7 +169,7 @@ int encrypt_page_pools_seq_show(struct seq_file *m, void *v) "out of mem: %lu\n", cfs_totalram_pages(), PTRS_PER_PAGE, pool->ppp_max_pages, - pool->ppp_max_pools, + pool->ppp_max_ptr_pages, pool->ppp_total_pages, pool->ppp_free_pages, pool->ppp_idle_idx, @@ -210,7 +210,7 @@ int page_pools_seq_show(struct seq_file *m, void *v) spin_lock(&pool->ppp_lock); seq_printf(m, " pool_%dk:\n" " max_pages: %lu\n" - " max_pools: %u\n" + " max_items: %lu\n" " total_pages: %lu\n" " total_free: %lu\n" " idle_index: %lu/100\n" @@ -229,7 +229,7 @@ int page_pools_seq_show(struct seq_file *m, void *v) /* convert from bytes to KiB */ element_size(pool) >> 10, pool->ppp_max_pages, - pool->ppp_max_pools, + pool->ppp_max_ptr_pages * PTRS_PER_PAGE, pool->ppp_total_pages, pool->ppp_free_pages, pool->ppp_idle_idx, @@ -486,7 +486,7 @@ static void pool_insert(void ***pools, int npools, int npages, PTRS_PER_PAGE; end_npools = (page_pool->ppp_total_pages + npages + PTRS_PER_PAGE - 1) / PTRS_PER_PAGE; - LASSERT(end_npools <= page_pool->ppp_max_pools); + LASSERT(end_npools <= page_pool->ppp_max_ptr_pages); np_idx = 0; while (cur_npools < end_npools) { @@ -994,19 +994,19 @@ EXPORT_SYMBOL(sptlrpc_pool_del_user); static inline void pool_ptrs_alloc(struct ptlrpc_page_pool *pool) { - LASSERT(pool->ppp_max_pools); + LASSERT(pool->ppp_max_ptr_pages); OBD_ALLOC_LARGE(pool->ppp_ptr_pages, - pool->ppp_max_pools * + pool->ppp_max_ptr_pages * sizeof(*pool->ppp_ptr_pages)); } static inline void pool_ptrs_free(struct ptlrpc_page_pool *pool) { - LASSERT(pool->ppp_max_pools); + LASSERT(pool->ppp_max_ptr_pages); LASSERT(pool->ppp_ptr_pages); OBD_FREE_LARGE(pool->ppp_ptr_pages, - pool->ppp_max_pools * sizeof(*pool->ppp_ptr_pages)); + pool->ppp_max_ptr_pages * sizeof(*pool->ppp_ptr_pages)); } int sptlrpc_pool_init(void) @@ -1036,7 +1036,7 @@ int sptlrpc_pool_init(void) pool = page_pools[pool_order]; pool->ppp_max_pages = pool_max_pages; - pool->ppp_max_pools = + pool->ppp_max_ptr_pages = npages_to_npools(pool->ppp_max_pages); init_waitqueue_head(&pool->ppp_waitq); -- 1.8.3.1