LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec

[fs/lustre-release.git] / lustre / ptlrpc / sec_bulk.c

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index 062de26..e6c1df1 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -147,7 +147,7 @@ int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v)
                   "max waitqueue depth:     %u\n"
                   "max wait time ms:        %lld\n"
                   "out of mem:              %lu\n",
-                  totalram_pages, PAGES_PER_POOL,
+                  cfs_totalram_pages(), PAGES_PER_POOL,
                   page_pools.epp_max_pages,
                   page_pools.epp_max_pools,
                   page_pools.epp_total_pages,
@@ -286,10 +286,6 @@ static int enc_pools_shrink(SHRINKER_ARGS(sc, nr_to_scan, gfp_mask))
                .nr_to_scan = shrink_param(sc, nr_to_scan),
                .gfp_mask   = shrink_param(sc, gfp_mask)
        };
-#if !defined(HAVE_SHRINKER_WANT_SHRINK_PTR) && !defined(HAVE_SHRINK_CONTROL)
-       struct shrinker *shrinker = NULL;
-#endif
-
        enc_pools_shrink_scan(shrinker, &scv);
 
        return enc_pools_shrink_count(shrinker, &scv);
@@ -772,9 +768,9 @@ int sptlrpc_enc_pool_init(void)
        DEF_SHRINKER_VAR(shvar, enc_pools_shrink,
                         enc_pools_shrink_count, enc_pools_shrink_scan);
 
-       page_pools.epp_max_pages = totalram_pages / 8;
+       page_pools.epp_max_pages = cfs_totalram_pages() / 8;
        if (enc_pool_max_memory_mb > 0 &&
-           enc_pool_max_memory_mb <= (totalram_pages >> mult))
+           enc_pool_max_memory_mb <= (cfs_totalram_pages() >> mult))
                page_pools.epp_max_pages = enc_pool_max_memory_mb << mult;
 
        page_pools.epp_max_pools = npages_to_npools(page_pools.epp_max_pages);