Commit 5646e13a authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: aacraid: move scsi_(block,unblock)_requests out of _aac_reset_adapter() 

_aac_reset_adapter() only has one caller, and that one already calls
scsi_block_requests(). Move the calls out of _aac_reset_adapter() to avoid
calling scsi_block_requests() twice.

Link: https://lore.kernel.org/r/20200228075318.91255-8-hare@suse.de


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBalsundar P &lt; <Balsundar.P@microchip.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b64f239e

drivers/scsi/aacraid/commsup.c

+4 −6
Original line number Diff line number Diff line
@@ -1476,7 +1476,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
{

	int index, quirks;

	int retval;

	struct Scsi_Host *host;

	struct Scsi_Host *host = aac->scsi_host_ptr;

	struct scsi_device *dev;

	int jafo = 0;

	int bled;
@@ -1493,8 +1493,6 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	 *	- The card is dead, or will be very shortly ;-/ so no new

	 *	  commands are completing in the interrupt service.

	 */

	host = aac->scsi_host_ptr;

	scsi_block_requests(host);

	aac_adapter_disable_int(aac);

	if (aac->thread && aac->thread->pid != current->pid) {

		spin_unlock_irq(host->host_lock);
@@ -1619,7 +1617,6 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 


out:

	aac->in_reset = 0;

	scsi_unblock_requests(host);



	/*

	 * Issue bus rescan to catch any configuration that might have
@@ -1640,7 +1637,7 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
{

	unsigned long flagv = 0;

	int retval;

	struct Scsi_Host * host;

	struct Scsi_Host *host = aac->scsi_host_ptr;

	int bled;



	if (spin_trylock_irqsave(&aac->fib_lock, flagv) == 0)
@@ -1658,7 +1655,6 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	 * target (block maximum 60 seconds). Although not necessary,

	 * it does make us a good storage citizen.

	 */

	host = aac->scsi_host_ptr;

	scsi_block_requests(host);



	/* Quiesce build, flush cache, write through mode */
@@ -1670,6 +1666,8 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	retval = _aac_reset_adapter(aac, bled, reset_type);

	spin_unlock_irqrestore(host->host_lock, flagv);



	scsi_unblock_requests(host);



	if ((forced < 2) && (retval == -ENODEV)) {

		/* Unwind aac_send_shutdown() IOP_RESET unsupported/disabled */

		struct fib * fibctx = aac_fib_alloc(aac);

CRA Git | Maintained and supported by SUSTech CRA and CCSE