Commit addf1372 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Martin K. Petersen
Browse files

scsi: zfcp: Use list_first_entry_or_null() in zfcp_erp_thread() 

Use the right helper to avoid poking around in the list's internals.

Link: https://lore.kernel.org/r/ed669555c73aab95b29444c10066f492c0c43391.1599765652.git.bblock@linux.ibm.com


Reviewed-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3f4fee00

drivers/s390/scsi/zfcp_erp.c

+3 −5
Original line number Diff line number Diff line
@@ -1607,7 +1607,6 @@ static enum zfcp_erp_act_result zfcp_erp_strategy( 
static int zfcp_erp_thread(void *data)

{

	struct zfcp_adapter *adapter = (struct zfcp_adapter *) data;

	struct list_head *next;

	struct zfcp_erp_action *act;

	unsigned long flags;
@@ -1620,12 +1619,11 @@ static int zfcp_erp_thread(void *data) 
			break;



		write_lock_irqsave(&adapter->erp_lock, flags);

		next = adapter->erp_ready_head.next;

		act = list_first_entry_or_null(&adapter->erp_ready_head,

					       struct zfcp_erp_action, list);

		write_unlock_irqrestore(&adapter->erp_lock, flags);



		if (next != &adapter->erp_ready_head) {

			act = list_entry(next, struct zfcp_erp_action, list);



		if (act) {

			/* there is more to come after dismission, no notify */

			if (zfcp_erp_strategy(act) != ZFCP_ERP_DISMISSED)

				zfcp_erp_wakeup(adapter);