Commit 8062b742 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: edif: Replace list_for_each_safe with list_for_each_entry_safe 

This patch is per review comment by Hannes Reinecke from previous
submission to replace list_for_each_safe with list_for_each_entry_safe.

Link: https://lore.kernel.org/r/20211026115412.27691-8-njavali@marvell.com


Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b1af26c2

drivers/scsi/qla2xxx/qla_edif.c

+9 −30
Original line number Diff line number Diff line
@@ -1671,43 +1671,27 @@ static struct enode * 
qla_enode_find(scsi_qla_host_t *vha, uint32_t ntype, uint32_t p1, uint32_t p2)

{

	struct enode		*node_rtn = NULL;

	struct enode		*list_node = NULL;

	struct enode		*list_node, *q;

	unsigned long		flags;

	struct list_head	*pos, *q;

	uint32_t		sid;

	uint32_t		rw_flag;

	struct purexevent	*purex;



	/* secure the list from moving under us */

	spin_lock_irqsave(&vha->pur_cinfo.pur_lock, flags);



	list_for_each_safe(pos, q, &vha->pur_cinfo.head) {

		list_node = list_entry(pos, struct enode, list);

	list_for_each_entry_safe(list_node, q, &vha->pur_cinfo.head, list) {



		/* node type determines what p1 and p2 are */

		purex = &list_node->u.purexinfo;

		sid = p1;

		rw_flag = p2;



		if (purex->pur_info.pur_sid.b24 == sid) {

			if (purex->pur_info.pur_pend == 1 &&

			    rw_flag == PUR_GET) {

				/*

				 * if the receive is in progress

				 * and its a read/get then can't

				 * transfer yet

				 */

				ql_dbg(ql_dbg_edif, vha, 0x9106,

				    "%s purex xfer in progress for sid=%x\n",

				    __func__, sid);

			} else {

			/* found it and its complete */

			node_rtn = list_node;

				list_del(pos);

			list_del(&list_node->list);

			break;

		}

	}

	}



	spin_unlock_irqrestore(&vha->pur_cinfo.pur_lock, flags);
@@ -2414,7 +2398,6 @@ void qla24xx_auth_els(scsi_qla_host_t *vha, void **pkt, struct rsp_que **rsp) 


	purex = &ptr->u.purexinfo;

	purex->pur_info.pur_sid = a.did;

	purex->pur_info.pur_pend = 0;

	purex->pur_info.pur_bytes_rcvd = totlen;

	purex->pur_info.pur_rx_xchg_address = le32_to_cpu(p->rx_xchg_addr);

	purex->pur_info.pur_nphdl = le16_to_cpu(p->nport_handle);
@@ -3166,18 +3149,14 @@ static uint16_t qla_edif_sadb_get_sa_index(fc_port_t *fcport, 
/* release any sadb entries -- only done at teardown */

void qla_edif_sadb_release(struct qla_hw_data *ha)

{

	struct list_head *pos;

	struct list_head *tmp;

	struct edif_sa_index_entry *entry;

	struct edif_sa_index_entry *entry, *tmp;



	list_for_each_safe(pos, tmp, &ha->sadb_rx_index_list) {

		entry = list_entry(pos, struct edif_sa_index_entry, next);

	list_for_each_entry_safe(entry, tmp, &ha->sadb_rx_index_list, next) {

		list_del(&entry->next);

		kfree(entry);

	}



	list_for_each_safe(pos, tmp, &ha->sadb_tx_index_list) {

		entry = list_entry(pos, struct edif_sa_index_entry, next);

	list_for_each_entry_safe(entry, tmp, &ha->sadb_tx_index_list, next) {

		list_del(&entry->next);

		kfree(entry);

	}

drivers/scsi/qla2xxx/qla_edif.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct dinfo { 
};



struct pur_ninfo {

	unsigned int	pur_pend:1;

	port_id_t       pur_sid;

	port_id_t	pur_did;

	uint8_t		vp_idx;

drivers/scsi/qla2xxx/qla_os.c

+4 −4
Original line number Diff line number Diff line
@@ -3885,13 +3885,13 @@ qla2x00_remove_one(struct pci_dev *pdev) 
static inline void

qla24xx_free_purex_list(struct purex_list *list)

{

	struct list_head *item, *next;

	struct purex_item *item, *next;

	ulong flags;



	spin_lock_irqsave(&list->lock, flags);

	list_for_each_safe(item, next, &list->head) {

		list_del(item);

		kfree(list_entry(item, struct purex_item, list));

	list_for_each_entry_safe(item, next, &list->head, list) {

		list_del(&item->list);

		kfree(item);

	}

	spin_unlock_irqrestore(&list->lock, flags);

}