LU-5710 all: second batch of corrected typos and grammar errors

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

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index a1e90e2..72285ba 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -232,26 +232,6 @@ void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj,
         policy->l_extent.end   = cl_offset(obj, end + 1) - 1;
 }
 
-static int osc_page_is_under_lock(const struct lu_env *env,
-                                 const struct cl_page_slice *slice,
-                                 struct cl_io *unused, pgoff_t *max_index)
-{
-       struct osc_page         *opg = cl2osc_page(slice);
-       struct ldlm_lock        *dlmlock;
-       int                     result = -ENODATA;
-
-       ENTRY;
-       dlmlock = osc_dlmlock_at_pgoff(env, cl2osc(slice->cpl_obj),
-                                      osc_index(opg), 1, 0);
-       if (dlmlock != NULL) {
-               *max_index = cl_index(slice->cpl_obj,
-                                     dlmlock->l_policy_data.l_extent.end);
-               LDLM_LOCK_PUT(dlmlock);
-               result = 0;
-       }
-       RETURN(result);
-}
-
 static const char *osc_list(struct list_head *head)
 {
        return list_empty(head) ? "-" : "+";
@@ -276,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",
@@ -406,7 +386,6 @@ static int osc_page_flush(const struct lu_env *env,
 static const struct cl_page_operations osc_page_ops = {
        .cpo_print         = osc_page_print,
        .cpo_delete        = osc_page_delete,
-       .cpo_is_under_lock = osc_page_is_under_lock,
        .cpo_clip           = osc_page_clip,
        .cpo_cancel         = osc_page_cancel,
        .cpo_flush          = osc_page_flush
@@ -521,7 +500,8 @@ static int osc_cache_too_much(struct client_obd *cli)
        long pages = atomic_long_read(&cli->cl_lru_in_list);
        unsigned long budget;
 
-       budget = cache->ccc_lru_max / atomic_read(&cache->ccc_users);
+       LASSERT(cache != NULL);
+       budget = cache->ccc_lru_max / (atomic_read(&cache->ccc_users) - 2);
 
        /* if it's going to run out LRU slots, we should free some, but not
         * too much to maintain faireness among OSCs. */
@@ -530,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;
 }
 
@@ -617,7 +600,7 @@ static void osc_lru_del(struct client_obd *cli, struct osc_page *opg)
  */
 static void osc_lru_use(struct client_obd *cli, struct osc_page *opg)
 {
-       /* If page is being transfered for the first time,
+       /* If page is being transferred for the first time,
         * ops_lru should be empty */
        if (opg->ops_in_lru && !list_empty(&opg->ops_lru)) {
                spin_lock(&cli->cl_lru_list_lock);
@@ -834,7 +817,7 @@ long osc_lru_reclaim(struct client_obd *cli)
        cache->ccc_lru_shrinkers++;
        list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru);
 
-       max_scans = atomic_read(&cache->ccc_users);
+       max_scans = atomic_read(&cache->ccc_users) - 2;
        while (--max_scans > 0 && !list_empty(&cache->ccc_lru)) {
                cli = list_entry(cache->ccc_lru.next, struct client_obd,
                                 cl_lru_osc);
@@ -925,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;