staging: lustre: obdclass: simplify cl_lock_fini()

Using list_first_entry_or_null() makes this (slightly)
simpler.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_lock.c b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
index d415f83960382c2643af97211335c1125c67eb0c..3b683b774fefec00299dadd2cf6d6a4a9d8ff982 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/cl_lock.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
@@ -79,13 +79,12 @@ EXPORT_SYMBOL(cl_lock_slice_add);
 
 void cl_lock_fini(const struct lu_env *env, struct cl_lock *lock)
 {
+       struct cl_lock_slice *slice;
        cl_lock_trace(D_DLMTRACE, env, "destroy lock", lock);
 
-       while (!list_empty(&lock->cll_layers)) {
-               struct cl_lock_slice *slice;
-
-               slice = list_entry(lock->cll_layers.next,
-                                  struct cl_lock_slice, cls_linkage);
+       while ((slice = list_first_entry_or_null(&lock->cll_layers,
+                                                struct cl_lock_slice,
+                                                cls_linkage)) != NULL) {
                list_del_init(lock->cll_layers.next);
                slice->cls_ops->clo_fini(env, slice);
        }