LU-3259 clio: cl_lock simplification

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

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index 29eaaf8..e1e4fdb 100644 (file)
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.c
@@ -99,6 +99,8 @@ static int osc_object_init(const struct lu_env *env, struct lu_object *obj,
        atomic_set(&osc->oo_nr_writes, 0);
        spin_lock_init(&osc->oo_lock);
        spin_lock_init(&osc->oo_tree_lock);
+       spin_lock_init(&osc->oo_ol_spin);
+       INIT_LIST_HEAD(&osc->oo_ol_list);
 
        cl_object_page_init(lu2cl(obj), sizeof(struct osc_page));
 
@@ -125,6 +127,7 @@ static void osc_object_free(const struct lu_env *env, struct lu_object *obj)
        LASSERT(list_empty(&osc->oo_reading_exts));
        LASSERT(atomic_read(&osc->oo_nr_reads) == 0);
        LASSERT(atomic_read(&osc->oo_nr_writes) == 0);
+       LASSERT(list_empty(&osc->oo_ol_list));
 
        lu_object_fini(obj);
        OBD_SLAB_FREE_PTR(osc, osc_object_kmem);
@@ -202,6 +205,32 @@ static int osc_object_glimpse(const struct lu_env *env,
         RETURN(0);
 }
 
+static int osc_object_ast_clear(struct ldlm_lock *lock, void *data)
+{
+       ENTRY;
+
+       LASSERT(lock->l_granted_mode == lock->l_req_mode);
+       if (lock->l_ast_data == data)
+               lock->l_ast_data = NULL;
+       RETURN(LDLM_ITER_CONTINUE);
+}
+
+static int osc_object_prune(const struct lu_env *env, struct cl_object *obj)
+{
+       struct osc_object       *osc = cl2osc(obj);
+       struct ldlm_res_id      *resname = &osc_env_info(env)->oti_resname;
+
+       LASSERTF(osc->oo_npages == 0,
+                DFID "still have %lu pages, obj: %p, osc: %p\n",
+                PFID(lu_object_fid(&obj->co_lu)), osc->oo_npages, obj, osc);
+
+       /* DLM locks don't hold a reference of osc_object so we have to
+        * clear it before the object is being destroyed. */
+       ostid_build_res_name(&osc->oo_oinfo->loi_oi, resname);
+       ldlm_resource_iterate(osc_export(osc)->exp_obd->obd_namespace, resname,
+                             osc_object_ast_clear, osc);
+       return 0;
+}
 
 void osc_object_set_contended(struct osc_object *obj)
 {
@@ -242,21 +271,21 @@ int osc_object_is_contended(struct osc_object *obj)
 }
 
 static const struct cl_object_operations osc_ops = {
-        .coo_page_init = osc_page_init,
-        .coo_lock_init = osc_lock_init,
-        .coo_io_init   = osc_io_init,
-        .coo_attr_get  = osc_attr_get,
-        .coo_attr_set  = osc_attr_set,
-        .coo_glimpse   = osc_object_glimpse
+       .coo_page_init = osc_page_init,
+       .coo_lock_init = osc_lock_init,
+       .coo_io_init   = osc_io_init,
+       .coo_attr_get  = osc_attr_get,
+       .coo_attr_set  = osc_attr_set,
+       .coo_glimpse   = osc_object_glimpse,
+       .coo_prune     = osc_object_prune
 };
 
 static const struct lu_object_operations osc_lu_obj_ops = {
-        .loo_object_init      = osc_object_init,
-        .loo_object_delete    = NULL,
-        .loo_object_release   = NULL,
-        .loo_object_free      = osc_object_free,
-        .loo_object_print     = osc_object_print,
-        .loo_object_invariant = NULL
+       .loo_object_init      = osc_object_init,
+       .loo_object_release   = NULL,
+       .loo_object_free      = osc_object_free,
+       .loo_object_print     = osc_object_print,
+       .loo_object_invariant = NULL
 };
 
 struct lu_object *osc_object_alloc(const struct lu_env *env,