LU-6179 llite: Implement ladvise lockahead

[fs/lustre-release.git] / lustre / ldlm / ldlm_reclaim.c

diff --git a/lustre/ldlm/ldlm_reclaim.c b/lustre/ldlm/ldlm_reclaim.c
index d256c64..b551ea2 100644 (file)
--- a/lustre/ldlm/ldlm_reclaim.c
+++ b/lustre/ldlm/ldlm_reclaim.c
@@ -344,7 +344,7 @@ static inline __u64 ldlm_ratio2locknr(int ratio)
 {
        __u64 locknr;
 
-       locknr = ((__u64)NUM_CACHEPAGES << PAGE_CACHE_SHIFT) * ratio;
+       locknr = ((__u64)NUM_CACHEPAGES << PAGE_SHIFT) * ratio;
        do_div(locknr, 100 * sizeof(struct ldlm_lock));
 
        return locknr;
@@ -370,7 +370,11 @@ int ldlm_reclaim_setup(void)
        ldlm_last_reclaim_age = LDLM_RECLAIM_AGE_MAX;
        ldlm_last_reclaim_time = cfs_time_current();
 
+#ifdef HAVE_PERCPU_COUNTER_INIT_GFP_FLAG
+       return percpu_counter_init(&ldlm_granted_total, 0, GFP_KERNEL);
+#else
        return percpu_counter_init(&ldlm_granted_total, 0);
+#endif
 }
 
 void ldlm_reclaim_cleanup(void)