b=19140

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

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index e49d43d..39f4edd 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -74,8 +74,13 @@ int lovsub_object_init(const struct lu_env *env, struct lu_object *obj,
 static void lovsub_object_free(const struct lu_env *env, struct lu_object *obj)
 {
         struct lovsub_object *los = lu2lovsub(obj);
+        struct lov_object    *lov = los->lso_super;
+
+        LASSERT(lov->lo_type == LLT_RAID0);
+        LASSERT(lov->u.raid0.lo_sub[los->lso_index] == los);
 
         ENTRY;
+        lov->u.raid0.lo_sub[los->lso_index] = NULL;
         lu_object_fini(obj);
         lu_object_header_fini(&los->lso_header.coh_lu);
         OBD_SLAB_FREE_PTR(los, lovsub_object_kmem);
@@ -136,7 +141,7 @@ struct lu_object *lovsub_object_alloc(const struct lu_env *env,
         struct lu_object     *obj;
 
         ENTRY;
-        OBD_SLAB_ALLOC_PTR(los, lovsub_object_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(los, lovsub_object_kmem, CFS_ALLOC_IO);
         if (los != NULL) {
                 struct cl_object_header *hdr;