From 37cce1bcb750ac12773f1c53afe88a8433f53eb3 Mon Sep 17 00:00:00 2001 From: Bhaktipriya Shridhar Date: Sat, 12 Mar 2016 01:32:13 +0530 Subject: [PATCH] staging: lustre: lnet: router: Use list_for_each_entry_safe Doubly linked lists which are iterated using list_empty and list_entry macros have been replaced with list_for_each_entry_safe macro. This makes the iteration simpler and more readable. This patch replaces the while loop containing list_empty and list_entry with list_for_each_entry_safe. This was done with Coccinelle. @@ expression E1; identifier I1, I2; type T; iterator name list_for_each_entry_safe; @@ T *I1; + T *tmp; ... - while (list_empty(&E1) == 0) + list_for_each_entry_safe (I1, tmp, &E1, I2) { ...when != T *I1; - I1 = list_entry(E1.next, T, I2); ... } Signed-off-by: Bhaktipriya Shridhar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lnet/lnet/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index 6a446010eda8..61459cf9d58f 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -1352,6 +1352,7 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) int npages = rbp->rbp_npages; struct list_head tmp; lnet_rtrbuf_t *rb; + lnet_rtrbuf_t *temp; if (!rbp->rbp_nbuffers) /* not initialized or already freed */ return; @@ -1368,8 +1369,7 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) lnet_net_unlock(cpt); /* Free buffers on the free list. */ - while (!list_empty(&tmp)) { - rb = list_entry(tmp.next, lnet_rtrbuf_t, rb_list); + list_for_each_entry_safe(rb, temp, &tmp, rb_list) { list_del(&rb->rb_list); lnet_destroy_rtrbuf(rb, npages); }