]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: lustre: lnet: config: Use list_for_each_entry_safe
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Fri, 11 Mar 2016 20:03:03 +0000 (01:33 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Mar 2016 06:09:09 +0000 (22:09 -0800)
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 <bhaktipriya96@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/lnet/config.c

index e71eea71a1ef2fb9a0291470763035f1db3bea37..449069c9e64936d5dfe35856e904438b48bb2a7b 100644 (file)
@@ -1020,6 +1020,7 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
        struct list_head *t;
        struct list_head *t2;
        struct lnet_text_buf *tb;
+       struct lnet_text_buf *temp;
        struct lnet_text_buf *tb2;
        __u32 net1;
        __u32 net2;
@@ -1042,9 +1043,7 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
        len = 0;
        rc = 0;
 
-       while (!list_empty(&raw_entries)) {
-               tb = list_entry(raw_entries.next, struct lnet_text_buf,
-                               ltb_list);
+       list_for_each_entry_safe(tb, temp, &raw_entries, ltb_list) {
                strncpy(source, tb->ltb_text, sizeof(source));
                source[sizeof(source) - 1] = '\0';