LU-10244 osc: add a bit to indicate osc_page in cache tree

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

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 8bc7fca..709e9dd 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -196,12 +196,17 @@ static void osc_page_delete(const struct lu_env *env,
        osc_lru_del(osc_cli(obj), opg);
 
        if (slice->cpl_page->cp_type == CPT_CACHEABLE) {
-               void *value;
+               void *value = NULL;
 
                spin_lock(&obj->oo_tree_lock);
-               value = radix_tree_delete(&obj->oo_tree, osc_index(opg));
-               if (value != NULL)
-                       --obj->oo_npages;
+               if (opg->ops_intree) {
+                       value = radix_tree_delete(&obj->oo_tree,
+                                                 osc_index(opg));
+                       if (value != NULL) {
+                               --obj->oo_npages;
+                               opg->ops_intree = 0;
+                       }
+               }
                spin_unlock(&obj->oo_tree_lock);
 
                LASSERT(ergo(value != NULL, value == opg));
@@ -300,8 +305,10 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,
                                spin_lock(&osc->oo_tree_lock);
                                result = radix_tree_insert(&osc->oo_tree,
                                                           index, opg);
-                               if (result == 0)
+                               if (result == 0) {
                                        ++osc->oo_npages;
+                                       opg->ops_intree = 1;
+                               }
                                spin_unlock(&osc->oo_tree_lock);
 
                                radix_tree_preload_end();