LU-6142 lov: simplfy lov_finish_set()

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

diff --git a/lustre/lov/lov_request.c b/lustre/lov/lov_request.c
index 4994011..511e423 100644 (file)
--- a/lustre/lov/lov_request.c
+++ b/lustre/lov/lov_request.c
@@ -47,19 +47,16 @@ static void lov_init_set(struct lov_request_set *set)
 
 static void lov_finish_set(struct lov_request_set *set)
 {
-       struct list_head *pos, *n;
        struct lov_request *req;
 
        ENTRY;
-
        LASSERT(set != NULL);
-       list_for_each_safe(pos, n, &set->set_list) {
-               req = list_entry(pos, struct lov_request, rq_link);
+       while ((req = list_first_entry_or_null(&set->set_list,
+                                              struct lov_request,
+                                              rq_link)) != NULL) {
                list_del_init(&req->rq_link);
-
                if (req->rq_oi.oi_osfs)
                        OBD_FREE_PTR(req->rq_oi.oi_osfs);
-
                OBD_FREE_PTR(req);
        }