Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aff15d4 authored by Bhaktipriya Shridhar's avatar Bhaktipriya Shridhar Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: socklnd: 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: default avatarBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1edae04f

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

+4 −5
Original line number Diff line number Diff line
@@ -1556,6 +1556,7 @@ ksocknal_finalize_zcreq(ksock_conn_t *conn) 
{

	ksock_peer_t *peer = conn->ksnc_peer;

	ksock_tx_t *tx;

	ksock_tx_t *temp;

	ksock_tx_t *tmp;

	LIST_HEAD(zlist);
@@ -1581,9 +1582,7 @@ ksocknal_finalize_zcreq(ksock_conn_t *conn) 


	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);

	}
@@ -2286,13 +2285,13 @@ ksocknal_free_buffers(void) 
	if (!list_empty(&ksocknal_data.ksnd_idle_noop_txs)) {

		struct list_head zlist;

		ksock_tx_t *tx;

		ksock_tx_t *temp;



		list_add(&zlist, &ksocknal_data.ksnd_idle_noop_txs);

		list_del_init(&ksocknal_data.ksnd_idle_noop_txs);

		spin_unlock(&ksocknal_data.ksnd_tx_lock);



		while (!list_empty(&zlist)) {

			tx = list_entry(zlist.next, ksock_tx_t, tx_list);

		list_for_each_entry_safe(tx, temp, &zlist, tx_list) {

			list_del(&tx->tx_list);

			LIBCFS_FREE(tx, tx->tx_desc_size);

		}