Prepare for Build 33

[fs/lustre-release.git] / lustre / lov / lov_object.c

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index a38d22b..5886885 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -38,12 +38,14 @@
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
  */
 
-/** \addtogroup lov lov @{ */
-
 #define DEBUG_SUBSYSTEM S_LOV
 
 #include "lov_cl_internal.h"
 
+/** \addtogroup lov
+ *  @{
+ */
+
 /*****************************************************************************
  *
  * Layout operations.
@@ -218,6 +220,7 @@ static int lov_init_raid0(const struct lu_env *env,
                         oinfo_get_fid(oinfo, ofid);
                         subdev = lovsub2cl_dev(dev->ld_target[ost_idx]);
                         subconf->u.coc_oinfo = oinfo;
+                        LASSERTF(subdev != NULL, "not init ost %d\n", ost_idx);
                         stripe = lov_sub_find(env, subdev, ofid, subconf);
                         if (!IS_ERR(stripe))
                                 result = lov_init_sub(env, lov, stripe, r0, i);
@@ -235,6 +238,42 @@ static void lov_delete_empty(const struct lu_env *env, struct lov_object *lov,
         LASSERT(lov->lo_type == LLT_EMPTY);
 }
 
+static void lov_subobject_kill(const struct lu_env *env, struct lov_object *lov,
+                               struct lovsub_object *los, int idx)
+{
+        struct cl_object        *sub;
+        struct lov_layout_raid0 *r0;
+        struct lu_site          *site;
+        cfs_waitlink_t          *waiter;
+
+        r0  = &lov->u.raid0;
+        LASSERT(r0->lo_sub[idx] == los);
+
+        sub  = lovsub2cl(los);
+        site = sub->co_lu.lo_dev->ld_site;
+
+        cl_object_kill(env, sub);
+        /* release a reference to the sub-object and ... */
+        lu_object_ref_del(&sub->co_lu, "lov-parent", lov);
+        cl_object_put(env, sub);
+
+        /* ... wait until it is actually destroyed---sub-object clears its
+         * ->lo_sub[] slot in lovsub_object_fini() */
+        if (r0->lo_sub[idx] == los) {
+                waiter = &lov_env_info(env)->lti_waiter;
+                cfs_waitlink_init(waiter);
+                cfs_waitq_add(&site->ls_marche_funebre, waiter);
+                set_current_state(CFS_TASK_UNINT);
+
+                while (r0->lo_sub[idx] == los)
+                        /* this wait-queue is signaled at the end of
+                         * lu_object_free(). */
+                        cfs_waitq_wait(waiter, CFS_TASK_UNINT);
+                cfs_waitq_del(&site->ls_marche_funebre, waiter);
+        }
+        LASSERT(r0->lo_sub[idx] == NULL);
+}
+
 static void lov_delete_raid0(const struct lu_env *env, struct lov_object *lov,
                              union lov_layout_state *state)
 {
@@ -242,17 +281,16 @@ static void lov_delete_raid0(const struct lu_env *env, struct lov_object *lov,
         int                      i;
 
         ENTRY;
-        if (r0->lo_sub != NULL &&
-            lu_object_is_dying(lov->lo_cl.co_lu.lo_header)) {
+        if (r0->lo_sub != NULL) {
                 for (i = 0; i < r0->lo_nr; ++i) {
-                        struct lovsub_object *sub = r0->lo_sub[i];
+                        struct lovsub_object *los = r0->lo_sub[i];
 
-                        if (sub != NULL)
+                        if (los != NULL)
                                 /*
                                  * If top-level object is to be evicted from
                                  * the cache, so are its sub-objects.
                                  */
-                                cl_object_kill(env, lovsub2cl(sub));
+                                lov_subobject_kill(env, lov, los, i);
                 }
         }
         EXIT;
@@ -271,19 +309,6 @@ static void lov_fini_raid0(const struct lu_env *env, struct lov_object *lov,
 
         ENTRY;
         if (r0->lo_sub != NULL) {
-                int i;
-
-                for (i = 0; i < r0->lo_nr; ++i) {
-                        struct cl_object *sub;
-
-                        if (r0->lo_sub[i] == NULL)
-                                continue;
-                        sub = lovsub2cl(r0->lo_sub[i]);
-                        cl_object_header(sub)->coh_parent = NULL;
-                        lu_object_ref_del(&sub->co_lu, "lov-parent", lov);
-                        cl_object_put(env, sub);
-                        r0->lo_sub[i] = NULL;
-                }
                 OBD_FREE(r0->lo_sub, r0->lo_nr * sizeof r0->lo_sub[0]);
                 r0->lo_sub = NULL;
         }
@@ -652,14 +677,14 @@ static const struct lu_object_operations lov_lu_obj_ops = {
 };
 
 struct lu_object *lov_object_alloc(const struct lu_env *env,
-                                   const struct lu_object_header *_,
+                                   const struct lu_object_header *unused,
                                    struct lu_device *dev)
 {
         struct lov_object *lov;
         struct lu_object  *obj;
 
         ENTRY;
-        OBD_SLAB_ALLOC_PTR(lov, lov_object_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(lov, lov_object_kmem, CFS_ALLOC_IO);
         if (lov != NULL) {
                 obj = lov2lu(lov);
                 lu_object_init(obj, NULL, dev);