[SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API (36a52920) · Commits · 戴 / test

Since the commit (sg: disable interrupts inside sg_copy_buffer), no need to disable interrupts before calling scsi_sg_copy_from_buffer. So we can simplify twa_scsiop_execute_scsi_complete() a bit, which disables interrupts just for scsi_sg_copy_from_buffer. Signed-off-by:

FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by:

Adam Radford <linuxraid@amcc.com> Signed-off-by:

James Bottomley <James.Bottomley@HansenPartnership.com>

drivers/scsi/3w-9xxx.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1924,12 +1924,9 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int re
	(cmd->sc_data_direction == DMA_FROM_DEVICE \|\|		(cmd->sc_data_direction == DMA_FROM_DEVICE \|\|
	cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {		cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {
	if (scsi_sg_count(cmd) == 1) {		if (scsi_sg_count(cmd) == 1) {
	unsigned long flags;
	void *buf = tw_dev->generic_buffer_virt[request_id];		void *buf = tw_dev->generic_buffer_virt[request_id];

	local_irq_save(flags);
	scsi_sg_copy_from_buffer(cmd, buf, TW_SECTOR_SIZE);		scsi_sg_copy_from_buffer(cmd, buf, TW_SECTOR_SIZE);
	local_irq_restore(flags);
	}		}
	}		}
	} /* End twa_scsiop_execute_scsi_complete() */		} /* End twa_scsiop_execute_scsi_complete() */

Admin message