send activate event only when connect finished and import state is FULL.

[fs/lustre-release.git] / lustre / obdclass / cl_object.c

diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c
index 98f7c09..0310b75 100644 (file)
--- a/lustre/obdclass/cl_object.c
+++ b/lustre/obdclass/cl_object.c
@@ -223,7 +223,7 @@ int cl_object_attr_get(const struct lu_env *env, struct cl_object *obj,
         struct lu_object_header *top;
         int result;
 
-        LASSERT(spin_is_locked(cl_object_attr_guard(obj)));
+        LASSERT_SPIN_LOCKED(cl_object_attr_guard(obj));
         ENTRY;
 
         top = obj->co_lu.lo_header;
@@ -255,7 +255,7 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj,
         struct lu_object_header *top;
         int result;
 
-        LASSERT(spin_is_locked(cl_object_attr_guard(obj)));
+        LASSERT_SPIN_LOCKED(cl_object_attr_guard(obj));
         ENTRY;
 
         top = obj->co_lu.lo_header;
@@ -298,7 +298,7 @@ int cl_object_glimpse(const struct lu_env *env, struct cl_object *obj,
                                 break;
                 }
         }
-        LU_OBJECT_HEADER(D_DLMTRACE, env, &obj->co_lu,
+        LU_OBJECT_HEADER(D_DLMTRACE, env, lu_object_top(top),
                          "size: "LPU64" mtime: "LPU64" atime: "LPU64" "
                          "ctime: "LPU64" blocks: "LPU64"\n",
                          lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_atime,