LU-1198 idl: move FID VER to DLM resource name[1]

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

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index 1fc74d0..9e5fb01 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -28,6 +28,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -239,17 +241,20 @@ static void enc_pools_release_free_pages(long npages)
  * could be called frequently for query (@nr_to_scan == 0).
  * we try to keep at least PTLRPC_MAX_BRW_PAGES pages in the pool.
  */
-static int enc_pools_shrink(SHRINKER_FIRST_ARG int nr_to_scan,
-                            unsigned int gfp_mask)
+static int enc_pools_shrink(SHRINKER_ARGS(sc, nr_to_scan, gfp_mask))
 {
-        if (unlikely(nr_to_scan != 0)) {
+        if (unlikely(shrink_param(sc, nr_to_scan) != 0)) {
                 cfs_spin_lock(&page_pools.epp_lock);
-                nr_to_scan = min(nr_to_scan, (int) page_pools.epp_free_pages -
-                                 PTLRPC_MAX_BRW_PAGES);
-                if (nr_to_scan > 0) {
-                        enc_pools_release_free_pages(nr_to_scan);
-                        CDEBUG(D_SEC, "released %d pages, %ld left\n",
-                               nr_to_scan, page_pools.epp_free_pages);
+                shrink_param(sc, nr_to_scan) = min_t(unsigned long,
+                                                   shrink_param(sc, nr_to_scan),
+                                                   page_pools.epp_free_pages -
+                                                   PTLRPC_MAX_BRW_PAGES);
+                if (shrink_param(sc, nr_to_scan) > 0) {
+                        enc_pools_release_free_pages(shrink_param(sc,
+                                                                  nr_to_scan));
+                        CDEBUG(D_SEC, "released %ld pages, %ld left\n",
+                               (long)shrink_param(sc, nr_to_scan),
+                               page_pools.epp_free_pages);
 
                         page_pools.epp_st_shrinks++;
                         page_pools.epp_last_shrink = cfs_time_current_sec();
@@ -770,14 +775,15 @@ void sptlrpc_enc_pool_fini(void)
         enc_pools_free();
 
         if (page_pools.epp_st_access > 0) {
-                CWARN("max pages %lu, grows %u, grow fails %u, shrinks %u, "
-                      "access %lu, missing %lu, max qlen %u, max wait "
-                      CFS_TIME_T"/%d\n",
-                      page_pools.epp_st_max_pages, page_pools.epp_st_grows,
-                      page_pools.epp_st_grow_fails,
-                      page_pools.epp_st_shrinks, page_pools.epp_st_access,
-                      page_pools.epp_st_missings, page_pools.epp_st_max_wqlen,
-                      page_pools.epp_st_max_wait, CFS_HZ);
+                CDEBUG(D_SEC,
+                       "max pages %lu, grows %u, grow fails %u, shrinks %u, "
+                       "access %lu, missing %lu, max qlen %u, max wait "
+                       CFS_TIME_T"/%d\n",
+                       page_pools.epp_st_max_pages, page_pools.epp_st_grows,
+                       page_pools.epp_st_grow_fails,
+                       page_pools.epp_st_shrinks, page_pools.epp_st_access,
+                       page_pools.epp_st_missings, page_pools.epp_st_max_wqlen,
+                       page_pools.epp_st_max_wait, CFS_HZ);
         }
 }