EX-8270 ptlrpc: rename get_buf to get_pages

The sptlrpc_enc_pool_get_buf function actually gets a fixed
number of pages, which is sort of a buffer, but is better
understood as a set of pages.

Rename the function for getting pages for a ptlrpc desc so
we can give get_buf a more appropriate name.

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

diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h
index f0950e4..2d7fa68 100644 (file)
--- a/lustre/include/lustre_sec.h
+++ b/lustre/include/lustre_sec.h
@@ -1166,12 +1166,12 @@ int sptlrpc_cli_install_rvs_ctx(struct obd_import *imp,
 #define PAGES_POOL 0
 int sptlrpc_enc_pool_add_user(void);
 int sptlrpc_enc_pool_del_user(void);
-int sptlrpc_enc_pool_get_pages(struct ptlrpc_bulk_desc *desc);
+int sptlrpc_enc_pool_get_desc_pages(struct ptlrpc_bulk_desc *desc);
 int sptlrpc_enc_pool_get_pages_array(struct page **pa, unsigned int count);
-int sptlrpc_enc_pool_get_buf(void **buf, unsigned int order);
-void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc);
+int sptlrpc_enc_pool_get_pages(void **buf, unsigned int order);
+void sptlrpc_enc_pool_put_desc_pages(struct ptlrpc_bulk_desc *desc);
 void sptlrpc_enc_pool_put_pages_array(struct page **pa, unsigned int count);
-void sptlrpc_enc_pool_put_buf(void *buf, unsigned int order);
+void sptlrpc_enc_pool_put_pages(void *buf, unsigned int order);
 int sptlrpc_enc_pool_get_free_pages(unsigned int pool);
 int pool_is_at_full_capacity(void);
 

diff --git a/lustre/osc/osc_compress.c b/lustre/osc/osc_compress.c
index eb9e985..916035b 100644 (file)
--- a/lustre/osc/osc_compress.c
+++ b/lustre/osc/osc_compress.c
@@ -245,9 +245,8 @@ void free_cpga(struct brw_page **cpga, u32 page_count)
                        continue;
 
                if (cpga[i]->bp_cmp_chunk)
-                       sptlrpc_enc_pool_put_buf(
-                                               &cpga[i]->bp_cmp_chunk,
-                                               cpga[i]->bp_cmp_chunk_size);
+                       sptlrpc_enc_pool_put_pages(&cpga[i]->bp_cmp_chunk,
+                                                  cpga[i]->bp_cmp_chunk_size);
 
                OBD_FREE(cpga[i], sizeof(**cpga));
        }
@@ -352,8 +351,8 @@ int compress_request(const char *obd_name, struct obdo *oa,
        OBD_ALLOC(*cpga, *page_count * sizeof(**cpga));
        src_buf_bits = chunk_bits;
        dest_buf_bits = chunk_bits + 1;
-       sptlrpc_enc_pool_get_buf(&src, src_buf_bits);
-       sptlrpc_enc_pool_get_buf(&wrkmem, dest_buf_bits);
+       sptlrpc_enc_pool_get_pages(&src, src_buf_bits);
+       sptlrpc_enc_pool_get_pages(&wrkmem, dest_buf_bits);
 
        if (*cpga == NULL || wrkmem == NULL || src == NULL)
                GOTO(out, rc = -ENOMEM);
@@ -374,7 +373,7 @@ int compress_request(const char *obd_name, struct obdo *oa,
                        merge_chunk(pga, chunk_start, pga_i + 1 - chunk_start,
                                    src, &src_size);
                        dst_size = 2 * chunk_size;
-                       sptlrpc_enc_pool_get_buf(&dst, dest_buf_bits);
+                       sptlrpc_enc_pool_get_pages(&dst, dest_buf_bits);
                        if (dst == NULL)
                                GOTO(out, rc = -ENOMEM);
 
@@ -403,7 +402,7 @@ int compress_request(const char *obd_name, struct obdo *oa,
                                       fill_bits);
 
                        if (!done) {
-                               sptlrpc_enc_pool_put_buf(&dst, dest_buf_bits);
+                               sptlrpc_enc_pool_put_pages(&dst, dest_buf_bits);
                        } else {
                                (*cpga)[cpga_i]->bp_cmp_chunk = dst;
                                (*cpga)[cpga_i]->bp_cmp_chunk_size =
@@ -423,10 +422,10 @@ int compress_request(const char *obd_name, struct obdo *oa,
                                                                        count);
 out:
        if (wrkmem != NULL)
-               sptlrpc_enc_pool_put_buf(&wrkmem, dest_buf_bits);
+               sptlrpc_enc_pool_put_pages(&wrkmem, dest_buf_bits);
 
        if (src != NULL)
-               sptlrpc_enc_pool_put_buf(&src, src_buf_bits);
+               sptlrpc_enc_pool_put_pages(&src, src_buf_bits);
 
        if (rc != 0 && *cpga != NULL)
                free_cpga(*cpga, *page_count);
@@ -536,9 +535,9 @@ int decompress_request(struct osc_brw_async_args *aa, int page_count)
                        CDEBUG(D_SEC, "chunk_size: %i, pages_in_chunk: %i\n",
                                chunk_size, pages_in_chunk);
 
-                       sptlrpc_enc_pool_get_buf((void **)&src,
+                       sptlrpc_enc_pool_get_pages((void **)&src,
                                buf_bits);
-                       sptlrpc_enc_pool_get_buf((void **)&dst,
+                       sptlrpc_enc_pool_get_pages((void **)&dst,
                                buf_bits);
                        if (src == NULL || dst == NULL)
                                GOTO(out, rc = -ENOMEM);
@@ -576,10 +575,10 @@ int decompress_request(struct osc_brw_async_args *aa, int page_count)
        CDEBUG(D_SEC, "Decompressed %i pages (%i chunks)\n", page_count, count);
 out:
        if (src != NULL)
-               sptlrpc_enc_pool_put_buf(&src, buf_bits);
+               sptlrpc_enc_pool_put_pages(&src, buf_bits);
 
        if (dst != NULL)
-               sptlrpc_enc_pool_put_buf(&dst, buf_bits);
+               sptlrpc_enc_pool_put_pages(&dst, buf_bits);
 
        RETURN(rc);
 }

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index f77fa9f..46031ad 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -292,7 +292,7 @@ void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc)
        LASSERT((desc->bd_export != NULL) ^ (desc->bd_import != NULL));
        LASSERT(desc->bd_frag_ops != NULL);
 
-       sptlrpc_enc_pool_put_pages(desc);
+       sptlrpc_enc_pool_put_desc_pages(desc);
 
        if (desc->bd_export)
                class_export_put(desc->bd_export);

diff --git a/lustre/ptlrpc/gss/gss_bulk.c b/lustre/ptlrpc/gss/gss_bulk.c
index 3ddc7ee..00db59f 100644 (file)
--- a/lustre/ptlrpc/gss/gss_bulk.c
+++ b/lustre/ptlrpc/gss/gss_bulk.c
@@ -137,7 +137,7 @@ int gss_cli_ctx_wrap_bulk(struct ptlrpc_cli_ctx *ctx,
                        if (desc->bd_iov_count == 0)
                                RETURN(0);
 
-                       rc = sptlrpc_enc_pool_get_pages(desc);
+                       rc = sptlrpc_enc_pool_get_desc_pages(desc);
                        if (rc) {
                                CERROR("bulk write: failed to allocate "
                                       "encryption pages: %d\n", rc);
@@ -303,7 +303,7 @@ static int gss_prep_bulk(struct ptlrpc_bulk_desc *desc,
         if (desc->bd_iov_count == 0)
                 return 0;
 
-        rc = sptlrpc_enc_pool_get_pages(desc);
+        rc = sptlrpc_enc_pool_get_desc_pages(desc);
         if (rc)
                 return rc;
 
@@ -492,7 +492,7 @@ int gss_svc_wrap_bulk(struct ptlrpc_request *req,
                         break;
                 }
 
-                rc = sptlrpc_enc_pool_get_pages(desc);
+                rc = sptlrpc_enc_pool_get_desc_pages(desc);
                 if (rc) {
                         bsdv->bsd_flags |= BSD_FL_ERR;
                         CERROR("bulk read: failed to allocate encryption "

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index 7911ce7..689f736 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -797,7 +797,7 @@ out_unlock:
        return rc;
 }
 
-int sptlrpc_enc_pool_get_pages(struct ptlrpc_bulk_desc *desc)
+int sptlrpc_enc_pool_get_desc_pages(struct ptlrpc_bulk_desc *desc)
 {
        int rc;
 
@@ -823,7 +823,7 @@ int sptlrpc_enc_pool_get_pages(struct ptlrpc_bulk_desc *desc)
        }
        return rc;
 }
-EXPORT_SYMBOL(sptlrpc_enc_pool_get_pages);
+EXPORT_SYMBOL(sptlrpc_enc_pool_get_desc_pages);
 
 int sptlrpc_enc_pool_get_pages_array(struct page **pa, unsigned int count)
 {
@@ -832,13 +832,13 @@ int sptlrpc_enc_pool_get_pages_array(struct page **pa, unsigned int count)
 }
 EXPORT_SYMBOL(sptlrpc_enc_pool_get_pages_array);
 
-int sptlrpc_enc_pool_get_buf(void **buf, unsigned int order)
+int sptlrpc_enc_pool_get_pages(void **pages, unsigned int order)
 {
-       return __sptlrpc_enc_pool_get_pages((void *)buf, 0,
+       return __sptlrpc_enc_pool_get_pages((void *)pages, 0,
                                            PPOOL_ORDER_TO_INDEX(order),
                                            page_from_bufarray);
 }
-EXPORT_SYMBOL(sptlrpc_enc_pool_get_buf);
+EXPORT_SYMBOL(sptlrpc_enc_pool_get_pages);
 
 static int __sptlrpc_enc_pool_put_pages(void *array, unsigned int count,
                                        unsigned int pool_idx,
@@ -891,7 +891,7 @@ out_unlock:
        return rc;
 }
 
-void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc)
+void sptlrpc_enc_pool_put_desc_pages(struct ptlrpc_bulk_desc *desc)
 {
        int rc;
 
@@ -920,7 +920,7 @@ void sptlrpc_enc_pool_put_pages_array(struct page **pa, unsigned int count)
 }
 EXPORT_SYMBOL(sptlrpc_enc_pool_put_pages_array);
 
-void sptlrpc_enc_pool_put_buf(void *buf, unsigned int order)
+void sptlrpc_enc_pool_put_pages(void *buf, unsigned int order)
 {
        int rc;
 
@@ -930,7 +930,7 @@ void sptlrpc_enc_pool_put_buf(void *buf, unsigned int order)
        if (rc)
                CDEBUG(D_SEC, "error putting pages in enc pool: %d\n", rc);
 }
-EXPORT_SYMBOL(sptlrpc_enc_pool_put_buf);
+EXPORT_SYMBOL(sptlrpc_enc_pool_put_pages);
 
 
 /*