| From d90eaf3ae111ba9499bba401798314efcebf73f0 Mon Sep 17 00:00:00 2001 |
| From: Kashyap, Desai <kashyap.desai@lsi.com> |
| Date: Thu, 10 Feb 2011 11:53:44 +0530 |
| Subject: [PATCH] mptfusion: Fix Incorrect return value in mptscsih_dev_reset |
| |
| commit bcfe42e98047f1935c5571c8ea77beb2d43ec19d upstream. |
| |
| There's a branch at the end of this function that |
| is supposed to normalize the return value with what |
| the mid-layer expects. In this one case, we get it wrong. |
| |
| Also increase the verbosity of the INFO level printk |
| at the end of mptscsih_abort to include the actual return value |
| and the scmd->serial_number. The reason being success |
| or failure is actually determined by the state of |
| the internal tag list when a TMF is issued, and not the |
| return value of the TMF cmd. The serial_number is also |
| used in this decision, thus it's useful to know for debugging |
| purposes. |
| |
| Reported-by: Peter M. Petrakis <peter.petrakis@canonical.com> |
| Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c |
| index c13726a..d2b0b11 100644 |
| --- a/drivers/message/fusion/mptscsih.c |
| +++ b/drivers/message/fusion/mptscsih.c |
| @@ -1841,8 +1841,9 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) |
| } |
| |
| out: |
| - printk(MYIOC_s_INFO_FMT "task abort: %s (sc=%p)\n", |
| - ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), SCpnt); |
| + printk(MYIOC_s_INFO_FMT "task abort: %s (rv=%04x) (sc=%p) (sn=%ld)\n", |
| + ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), retval, |
| + SCpnt, SCpnt->serial_number); |
| |
| return retval; |
| } |
| @@ -1879,7 +1880,7 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt) |
| |
| vdevice = SCpnt->device->hostdata; |
| if (!vdevice || !vdevice->vtarget) { |
| - retval = SUCCESS; |
| + retval = 0; |
| goto out; |
| } |
| |
| -- |
| 1.7.4.4 |
| |
