Commit 1edae04f authored Mar 12, 2016 by Bhaktipriya Shridhar Committed by Greg Kroah-Hartman Mar 11, 2016

staging: lustre: lnet: socklnd_proto: 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 <bhaktipriya96@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 74cb7e3f

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -403,6 +403,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
		{
		ksock_peer_t *peer = conn->ksnc_peer;
		ksock_tx_t *tx;
		ksock_tx_t *temp;
		ksock_tx_t *tmp;
		LIST_HEAD(zlist);
		int count;
		@@ -436,8 +437,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)

		spin_unlock(&peer->ksnp_lock);

		while (!list_empty(&zlist)) {
		tx = list_entry(zlist.next, ksock_tx_t, tx_zc_list);
		list_for_each_entry_safe(tx, temp, &zlist, tx_zc_list) {
		list_del(&tx->tx_zc_list);
		ksocknal_tx_decref(tx);
		}