luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isci: debug fixes

Browse Source 
Some of the chain walks to get back to our dev are invalid.

isci_remote_device_change_state: delete rather than adding conditional deref
chain walking
isci_request_change_state: fix, it was being called too early
isci_request_ssp_io_request_get_lun: fix compile breakage hidden by ifdef DEBUG

Signed-off-by: Maciej Trela <maciej.trela@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2011-02-18 09:25:15 -08:00
parent 83e514301e
commit 83f5eeef59
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/isci/remote_device.c
View File

@ -686,12 +686,6 @@ void isci_remote_device_change_state(
{ {
unsigned long flags; unsigned long flags;
dev_dbg(&isci_device->isci_port->isci_host->pdev->dev,
"%s: isci_device = %p, state = 0x%x",
__func__,
isci_device,
status);
spin_lock_irqsave(&isci_device->state_lock, flags); spin_lock_irqsave(&isci_device->state_lock, flags);
isci_device->status = status; isci_device->status = status;
spin_unlock_irqrestore(&isci_device->state_lock, flags); spin_unlock_irqrestore(&isci_device->state_lock, flags);

6
drivers/scsi/isci/request.c
View File

@ -285,7 +285,6 @@ static int isci_request_alloc_core(
/* initialize the request object. */ /* initialize the request object. */
spin_lock_init(&request->state_lock); spin_lock_init(&request->state_lock);
isci_request_change_state(request, allocated);
request->sci_request_mem_ptr = ((u8 *)request) + request->sci_request_mem_ptr = ((u8 *)request) +
sizeof(struct isci_request); sizeof(struct isci_request);
request->request_daddr = handle; request->request_daddr = handle;
@ -302,6 +301,7 @@ static int isci_request_alloc_core(
INIT_LIST_HEAD(&request->dev_node); INIT_LIST_HEAD(&request->dev_node);
*isci_request = request; *isci_request = request;
isci_request_change_state(request, allocated);
return ret; return ret;
} }
@ -1389,8 +1389,8 @@ u32 isci_request_ssp_io_request_get_lun(
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
dev_dbg(&request->isci_host->pdev->dev, dev_dbg(&request->isci_host->pdev->dev,
"%s: request->task->ssp_task.LUN[%d] = %x\n", "%s: task->ssp_task.LUN[%d] = %x\n",
__func__, i, request->task->ssp_task.LUN[i]); __func__, i, task->ssp_task.LUN[i]);
#endif #endif