LU-6142 obdclass: use cl_object_for_each more broadly.

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

diff --git a/lustre/obdclass/cl_lock.c b/lustre/obdclass/cl_lock.c
index 30c7186..8e417c0 100644 (file)
--- a/lustre/obdclass/cl_lock.c
+++ b/lustre/obdclass/cl_lock.c
@@ -109,8 +109,7 @@ int cl_lock_init(const struct lu_env *env, struct cl_lock *lock,
        LASSERT(obj != NULL);
 
        INIT_LIST_HEAD(&lock->cll_layers);
-       list_for_each_entry(scan, &obj->co_lu.lo_header->loh_layers,
-                           co_lu.lo_linkage) {
+       cl_object_for_each(scan, obj) {
                if (scan->co_ops->coo_lock_init != NULL)
                        result = scan->co_ops->coo_lock_init(env, scan, lock,
                                                             io);
@@ -205,7 +204,7 @@ int cl_lock_request(const struct lu_env *env, struct cl_io *io,
 
        if ((enq_flags & CEF_GLIMPSE) && !(enq_flags & CEF_SPECULATIVE)) {
                anchor = &cl_env_info(env)->clt_anchor;
-               cl_sync_io_init(anchor, 1, cl_sync_io_end);
+               cl_sync_io_init(anchor, 1);
        }
 
        rc = cl_lock_enqueue(env, io, lock, anchor);
@@ -247,7 +246,7 @@ const char *cl_lock_mode_name(const enum cl_lock_mode mode)
                [CLM_WRITE]   = "W",
                [CLM_GROUP]   = "G"
        };
-       CLASSERT(CLM_MAX == ARRAY_SIZE(names));
+       BUILD_BUG_ON(CLM_MAX != ARRAY_SIZE(names));
        return names[mode];
 }
 EXPORT_SYMBOL(cl_lock_mode_name);