LU-6370 osc: disable to control per-OSC LRU budget

[fs/lustre-release.git] / lustre / osc / osc_page.c

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 08eb661..dd83ef9 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -256,7 +256,7 @@ static int osc_page_print(const struct lu_env *env,
 
        return (*printer)(env, cookie, LUSTRE_OSC_NAME"-page@%p %lu: "
                          "1< %#x %d %u %s %s > "
-                         "2< "LPU64" %u %u %#x %#x | %p %p %p > "
+                         "2< "LPD64" %u %u %#x %#x | %p %p %p > "
                          "3< %s %p %d %lu %d > "
                          "4< %d %d %d %lu %s | %s %s %s %s > "
                          "5< %s %s %s %s | %d %s | %d %s %s>\n",
@@ -510,8 +510,11 @@ static int osc_cache_too_much(struct client_obd *cli)
                        return lru_shrink_max;
                else if (pages >= budget / 2)
                        return lru_shrink_min;
+#if 0
        } else if (pages >= budget * 2)
                return lru_shrink_min;
+#endif
+       }
        return 0;
 }
 
@@ -905,7 +908,7 @@ out:
 static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
                                            int factor)
 {
-       obd_count page_count = desc->bd_iov_count;
+       int page_count = desc->bd_iov_count;
        void *zone = NULL;
        int count = 0;
        int i;