The patch titled
ieee1394: sbp2: safer agent reset in error handlers
has been added to the -mm tree. Its filename is
ieee1394-sbp2-safer-agent-reset-in-error-handlers.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ieee1394: sbp2: safer agent reset in error handlers
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
The scsi_host_template's eh_abort_handler and eh_device_reset_handler are
allowed to sleep. Use this to run sbp2_agent_reset in the more reliable mode
which returns _after_ its write transaction was finished.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/sbp2.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-safer-agent-reset-in-error-handlers drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.c~ieee1394-sbp2-safer-agent-reset-in-error-handlers
+++ a/drivers/ieee1394/sbp2.c
@@ -2588,7 +2588,7 @@ static int sbp2scsi_abort(struct scsi_cm
/*
* Initiate a fetch agent reset.
*/
- sbp2_agent_reset(scsi_id, 0);
+ sbp2_agent_reset(scsi_id, 1);
sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
}
@@ -2607,7 +2607,7 @@ static int sbp2scsi_reset(struct scsi_cm
if (sbp2util_node_is_available(scsi_id)) {
SBP2_ERR("Generating sbp2 fetch agent reset");
- sbp2_agent_reset(scsi_id, 0);
+ sbp2_agent_reset(scsi_id, 1);
}
return SUCCESS;
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
ieee1394-remove-include-asm-semaphoreh.patch
ieee1394-sbp2-safer-last_orb-and.patch
ieee1394-sbp2-discard-return-value-of.patch
ieee1394-sbp2-optimize-dma-direction-of.patch
ieee1394-sbp2-safer-initialization-of.patch
ieee1394-sbp2-more-checks-of-status.patch
ieee1394-sbp2-convert.patch
ieee1394-safer-definition-of-empty-macros.patch
ieee1394-sbp2-workaround-for-write-protect-bit-of.patch
ieee1394-sbp2-enable-auto-spin-up-for-all-sbp-2-devices.patch
config_pm=n-slim-drivers-ieee1394-ohci1394c.patch
the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch
ieee1394-sbp2-handle-sbp2util_node_write_no_wait-failed.patch
ieee1394-sbp2-safer-agent-reset-in-error-handlers.patch
ieee1394-sbp2-recheck-node-generation-in-sbp2_update.patch
ieee1394-sbp2-better-handling-of-transport-errors.patch
ieee1394-sbp2-select-scsi-in-kconfig.patch
ieee1394-sbp2-update-includes.patch
ieee1394-sbp2-prevent-rare-deadlock-in-shutdown.patch
initialize-ieee1394-early-when-built-in.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
