LU-6142 lustre: use list_first_entry() in lustre subdirectory.

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

diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c
index ae0964b..927bbed 100644 (file)
--- a/lustre/lov/lov_io.c
+++ b/lustre/lov/lov_io.c
@@ -642,16 +642,14 @@ static void lov_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
 {
        struct lov_io *lio = cl2lov_io(env, ios);
        struct lov_object *lov = cl2lov(ios->cis_obj);
+       struct lov_io_sub *sub;
 
        ENTRY;
-
        LASSERT(list_empty(&lio->lis_active));
 
-       while (!list_empty(&lio->lis_subios)) {
-               struct lov_io_sub *sub = list_entry(lio->lis_subios.next,
-                                                   struct lov_io_sub,
-                                                   sub_list);
-
+       while ((sub = list_first_entry_or_null(&lio->lis_subios,
+                                              struct lov_io_sub,
+                                              sub_list)) != NULL) {
                list_del_init(&sub->sub_list);
                lio->lis_nr_subios--;