Block I/O while SG reset operation in progress - lpfc portion
PATCH 2/2 Block I/O while SG reset operation in progress - lpfc portion
This removes the duplicate functionality which had been added to the lpfc driver.
Signed-off-by James Smart <[email protected]>
lpfc.h +0 -1
@@ -176,7 +176,6 @@ struct lpfc_hba {dma_addr_t slim2p_mapping;uint16_t pci_cfg_value; -struct semaphore hba_can_block;int32_t hba_state;#define LPFC_STATE_UNKNOWN 0/* HBA state is unknown */
lpfc_init.c +0 -1
@@ -1463,7 +1463,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, goto out_put_host; host->unique_id = phba->brd_no; -init_MUTEX (&phba->hba_can_block);INIT_LIST_HEAD (&phba->ctrspbuflist);INIT_LIST_HEAD (&phba->rnidrspbuflist);INIT_LIST_HEAD (&phba->freebufList);
lpfc_scsi.c +0 -20
@@ -41,20 +41,6 @@#define LPFC_ABORT_WAIT 2 -static inline void -lpfc_block_requests (struct lpfc_hba * phba) -{ -down (&phba->hba_can_block); -scsi_block_requests (phba->host); -} - -static inline void -lpfc_unblock_requests (struct lpfc_hba * phba) -{ -scsi_unblock_requests (phba->host); -up (&phba->hba_can_block); -} -/* * This routine allocates a scsi buffer, which contains all the necessary * information needed to initiate a SCSI I/O. The non-DMAable buffer region
@@ -891,7 +877,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnunsigned int loop_count =0 ;int ret =SUCCESS ; -lpfc_block_requests (phba);spin_lock_irq (shost->host_lock); lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble;
@@ -977,7 +962,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmn cmnd->device->lun, cmnd->serial_number);spin_unlock_irq (shost->host_lock); -lpfc_unblock_requests (phba);return ret; }
@@ -995,7 +979,6 @@ lpfc_reset_lun_handler(struct scsi_cmndint ret =FAILED ;int cnt, loopcnt; -lpfc_block_requests (phba);spin_lock_irq (shost->host_lock);/* * If target is not in a MAPPED state, delay the reset until
@@ -1091,7 +1074,6 @@ out_free_scsi_buf: out:spin_unlock_irq (shost->host_lock); -lpfc_unblock_requests (phba);return ret; }
@@ -1107,7 +1089,6 @@ lpfc_reset_bus_handler(struct scsi_cmndunsigned int midlayer_id =0 ;struct lpfc_scsi_buf * lpfc_cmd; -lpfc_block_requests (phba);spin_lock_irq (shost->host_lock); lpfc_cmd =lpfc_get_scsi_buf (phba);
@@ -1193,7 +1174,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd phba->brd_no, ret); out:spin_unlock_irq (shost->host_lock); -lpfc_unblock_requests (phba);return ret; }