Commit 7831a09f authored by Douglas Gilbert's avatar Douglas Gilbert Committed by Linus Torvalds

[PATCH] scsi_error 2.5.12

The attachment is part of a patch from Justin Gibbs
described in:
http://marc.theaimsgroup.com/?l=linux-scsi&m=101200279101550&w=2

The original patch was targeted at lk 2.4 and Dave forwarded
ported it into 2.5. Other bits (e.g. sr) have already found
there way into your tree. One bit in the sd driver will be
included in my following patch.
parent 77208e0e
...@@ -1013,13 +1013,7 @@ int scsi_decide_disposition(Scsi_Cmnd * SCpnt) ...@@ -1013,13 +1013,7 @@ int scsi_decide_disposition(Scsi_Cmnd * SCpnt)
SCpnt->flags &= ~IS_RESETTING; SCpnt->flags &= ~IS_RESETTING;
goto maybe_retry; goto maybe_retry;
} }
/* return SUCCESS;
* Examine the sense data to figure out how to proceed from here.
* If there is no sense data, we will be forced into the error
* handler thread, where we get to examine the thing in a lot more
* detail.
*/
return scsi_check_sense(SCpnt);
default: default:
return FAILED; return FAILED;
} }
...@@ -2002,6 +1996,7 @@ scsi_new_reset(Scsi_Cmnd *SCpnt, int flag) ...@@ -2002,6 +1996,7 @@ scsi_new_reset(Scsi_Cmnd *SCpnt, int flag)
return rtn; return rtn;
} }
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically * Emacs will notice this stuff at the end of the file and automatically
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment