EX-8270 ptlrpc: improve use of 'count'

This is a first trivial step towards fixing usage of
'count' in the page pools code.  (And a whitespace fix.)

Test-Parameters: trivial
Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: Ic4f74db74b8cec63572d5fd5b129f861ab0cba7c
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52433
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index d9922cd..0170cc5 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -687,9 +687,6 @@ static inline int __sptlrpc_pool_get_pages(void *array, unsigned int count,
        int p_idx, g_idx;
        int i, rc = 0;
 
-       if (pool_idx != PAGES_POOL)
-               count = 1;
-
        if (!array || count <= 0 || count > page_pool->ppp_max_pages)
                return -EINVAL;
 
@@ -823,7 +820,7 @@ int sptlrpc_pool_get_desc_pages(struct ptlrpc_bulk_desc *desc)
                return -ENOMEM;
 
        rc = __sptlrpc_pool_get_pages((void *)desc, desc->bd_iov_count,
-                                         PAGES_POOL, page_from_bulkdesc);
+                                     PAGES_POOL, page_from_bulkdesc);
        if (rc) {
                OBD_FREE_LARGE(desc->bd_enc_vec,
                               desc->bd_iov_count *
@@ -843,7 +840,7 @@ EXPORT_SYMBOL(sptlrpc_pool_get_pages_array);
 
 int sptlrpc_pool_get_pages(void **pages, unsigned int order)
 {
-       return __sptlrpc_pool_get_pages((void *)pages, 0,
+       return __sptlrpc_pool_get_pages((void *)pages, 1,
                                            PPOOL_ORDER_TO_INDEX(order),
                                            page_from_bufarray);
 }