[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.

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 9881e2e846ed21ab212a4aca1d6723dcaf266d28..d68a625f2ff605c7ae4bcec66ea6723d0e252feb 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1013,13 +1013,7 @@ int scsi_decide_disposition(Scsi_Cmnd * SCpnt)
                        SCpnt->flags &= ~IS_RESETTING;
                        goto maybe_retry;
                }
-               /*
-                * 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);
+               return SUCCESS;
        default:
                return FAILED;
        }
@@ -2002,6 +1996,7 @@ scsi_new_reset(Scsi_Cmnd *SCpnt, int flag)
        return rtn;
 }
 
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically