Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

[SCSI] Block I/O while SG reset operation in progress - lpfc portion

Browse source 
This removes the duplicate functionality which had been added to
the lpfc driver.

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Smart 2006-03-08 14:50:18 -05:00 committed by James Bottomley
parent d7a1bb0a04
commit 79ac6745e4
3 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/lpfc/lpfc.h
View file

@ -174,7 +174,6 @@ struct lpfc_hba {
dma_addr_t slim2p_mapping; dma_addr_t slim2p_mapping;
uint16_t pci_cfg_value; uint16_t pci_cfg_value;
struct semaphore hba_can_block;
int32_t hba_state; int32_t hba_state;
#define LPFC_STATE_UNKNOWN 0 /* HBA state is unknown */ #define LPFC_STATE_UNKNOWN 0 /* HBA state is unknown */

1
drivers/scsi/lpfc/lpfc_init.c
View file

@ -1451,7 +1451,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
goto out_put_host; goto out_put_host;
host->unique_id = phba->brd_no; host->unique_id = phba->brd_no;
init_MUTEX(&phba->hba_can_block);
INIT_LIST_HEAD(&phba->ctrspbuflist); INIT_LIST_HEAD(&phba->ctrspbuflist);
INIT_LIST_HEAD(&phba->rnidrspbuflist); INIT_LIST_HEAD(&phba->rnidrspbuflist);
INIT_LIST_HEAD(&phba->freebufList); INIT_LIST_HEAD(&phba->freebufList);

20
drivers/scsi/lpfc/lpfc_scsi.c
View file

@ -41,20 +41,6 @@
#define LPFC_ABORT_WAIT 2 #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 * This routine allocates a scsi buffer, which contains all the necessary
* information needed to initiate a SCSI I/O. The non-DMAable buffer region * information needed to initiate a SCSI I/O. The non-DMAable buffer region
@ -859,7 +845,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
unsigned int loop_count = 0; unsigned int loop_count = 0;
int ret = SUCCESS; int ret = SUCCESS;
lpfc_block_requests(phba);
spin_lock_irq(shost->host_lock); spin_lock_irq(shost->host_lock);
lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble; lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble;
@ -945,7 +930,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
cmnd->device->lun, cmnd->serial_number); cmnd->device->lun, cmnd->serial_number);
spin_unlock_irq(shost->host_lock); spin_unlock_irq(shost->host_lock);
lpfc_unblock_requests(phba);
return ret; return ret;
} }
@ -963,7 +947,6 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
int ret = FAILED; int ret = FAILED;
int cnt, loopcnt; int cnt, loopcnt;
lpfc_block_requests(phba);
spin_lock_irq(shost->host_lock); spin_lock_irq(shost->host_lock);
/* /*
* If target is not in a MAPPED state, delay the reset until * If target is not in a MAPPED state, delay the reset until
@ -1065,7 +1048,6 @@ out_free_scsi_buf:
out: out:
spin_unlock_irq(shost->host_lock); spin_unlock_irq(shost->host_lock);
lpfc_unblock_requests(phba);
return ret; return ret;
} }
@ -1080,7 +1062,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
int cnt, loopcnt; int cnt, loopcnt;
struct lpfc_scsi_buf * lpfc_cmd; struct lpfc_scsi_buf * lpfc_cmd;
lpfc_block_requests(phba);
spin_lock_irq(shost->host_lock); spin_lock_irq(shost->host_lock);
lpfc_cmd = lpfc_get_scsi_buf(phba); lpfc_cmd = lpfc_get_scsi_buf(phba);
@ -1163,7 +1144,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
phba->brd_no, ret); phba->brd_no, ret);
out: out:
spin_unlock_irq(shost->host_lock); spin_unlock_irq(shost->host_lock);
lpfc_unblock_requests(phba);
return ret; return ret;
} }