On Fri, May 27, 2005 at 09:10:58AM -0500, Brian King wrote: > diff -puN drivers/scsi/ipr.c~ipr_abort_locking drivers/scsi/ipr.c > --- linux-2.6.12-rc5/drivers/scsi/ipr.c~ipr_abort_locking 2005-05-27 08:57:49.000000000 -0500 > +++ linux-2.6.12-rc5-bjking1/drivers/scsi/ipr.c 2005-05-27 09:00:48.000000000 -0500 > @@ -3069,6 +3069,11 @@ static int ipr_cancel_op(struct scsi_cmn > ioa_cfg = (struct ipr_ioa_cfg *)scsi_cmd->device->host->hostdata; > res = scsi_cmd->device->hostdata; > > + /* If we are currently going through reset/reload, return failed. This will force the > + mid-layer to call ipr_eh_host_reset, which will then go to sleep and wait for the > + reset to complete */ > + if (ioa_cfg->in_reset_reload || ioa_cfg->ioa_is_dead) > + return FAILED; I appreciate you've only moved this comment from elsewhere, but could you reformat it to fewer than 80 columns please? -- "Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
