diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 7dc4c2e6bed2..aea1ee472f3d 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
| @@ -41,20 +41,6 @@ | |||
| 41 | #define LPFC_ABORT_WAIT 2 | 41 | #define LPFC_ABORT_WAIT 2 |
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | static inline void | ||
| 45 | lpfc_block_requests(struct lpfc_hba * phba) | ||
| 46 | { | ||
| 47 | down(&phba->hba_can_block); | ||
| 48 | scsi_block_requests(phba->host); | ||
| 49 | } | ||
| 50 | |||
| 51 | static inline void | ||
| 52 | lpfc_unblock_requests(struct lpfc_hba * phba) | ||
| 53 | { | ||
| 54 | scsi_unblock_requests(phba->host); | ||
| 55 | up(&phba->hba_can_block); | ||
| 56 | } | ||
| 57 | |||
| 58 | /* | 44 | /* |
| 59 | * This routine allocates a scsi buffer, which contains all the necessary | 45 | * This routine allocates a scsi buffer, which contains all the necessary |
| 60 | * information needed to initiate a SCSI I/O. The non-DMAable buffer region | 46 | * information needed to initiate a SCSI I/O. The non-DMAable buffer region |
| @@ -859,7 +845,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
| 859 | unsigned int loop_count = 0; | 845 | unsigned int loop_count = 0; |
| 860 | int ret = SUCCESS; | 846 | int ret = SUCCESS; |
| 861 | 847 | ||
| 862 | lpfc_block_requests(phba); | ||
| 863 | spin_lock_irq(shost->host_lock); | 848 | spin_lock_irq(shost->host_lock); |
| 864 | 849 | ||
| 865 | lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble; | 850 | lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble; |
| @@ -945,7 +930,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
| 945 | cmnd->device->lun, cmnd->serial_number); | 930 | cmnd->device->lun, cmnd->serial_number); |
| 946 | 931 | ||
| 947 | spin_unlock_irq(shost->host_lock); | 932 | spin_unlock_irq(shost->host_lock); |
| 948 | lpfc_unblock_requests(phba); | ||
| 949 | 933 | ||
| 950 | return ret; | 934 | return ret; |
| 951 | } | 935 | } |
| @@ -963,7 +947,6 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd) | |||
| 963 | int ret = FAILED; | 947 | int ret = FAILED; |
| 964 | int cnt, loopcnt; | 948 | int cnt, loopcnt; |
| 965 | 949 | ||
| 966 | lpfc_block_requests(phba); | ||
| 967 | spin_lock_irq(shost->host_lock); | 950 | spin_lock_irq(shost->host_lock); |
| 968 | /* | 951 | /* |
| 969 | * If target is not in a MAPPED state, delay the reset until | 952 | * If target is not in a MAPPED state, delay the reset until |
| @@ -1065,7 +1048,6 @@ out_free_scsi_buf: | |||
| 1065 | 1048 | ||
| 1066 | out: | 1049 | out: |
| 1067 | spin_unlock_irq(shost->host_lock); | 1050 | spin_unlock_irq(shost->host_lock); |
| 1068 | lpfc_unblock_requests(phba); | ||
| 1069 | return ret; | 1051 | return ret; |
| 1070 | } | 1052 | } |
| 1071 | 1053 | ||
| @@ -1080,7 +1062,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd) | |||
| 1080 | int cnt, loopcnt; | 1062 | int cnt, loopcnt; |
| 1081 | struct lpfc_scsi_buf * lpfc_cmd; | 1063 | struct lpfc_scsi_buf * lpfc_cmd; |
| 1082 | 1064 | ||
| 1083 | lpfc_block_requests(phba); | ||
| 1084 | spin_lock_irq(shost->host_lock); | 1065 | spin_lock_irq(shost->host_lock); |
| 1085 | 1066 | ||
| 1086 | lpfc_cmd = lpfc_get_scsi_buf(phba); | 1067 | lpfc_cmd = lpfc_get_scsi_buf(phba); |
| @@ -1163,7 +1144,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd) | |||
| 1163 | phba->brd_no, ret); | 1144 | phba->brd_no, ret); |
| 1164 | out: | 1145 | out: |
| 1165 | spin_unlock_irq(shost->host_lock); | 1146 | spin_unlock_irq(shost->host_lock); |
| 1166 | lpfc_unblock_requests(phba); | ||
| 1167 | return ret; | 1147 | return ret; |
| 1168 | } | 1148 | } |
| 1169 | 1149 | ||
