Commit:     d0076f7754dce07c7a1d752034561acadd99eafa
Parent:     5c1da582b3a95123ffb1e70ec7cd60e757c7c8c2
Author:     Martin Peschke <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 15 13:57:08 2007 +0100
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Fri Nov 16 13:02:57 2007 -0600

    [SCSI] zfcp: fix dismissal of error recovery actions
    zfcp_erp_action_dismiss() used to ignore any actions in the ready list. This
    is a bug. Any action superseded by a stronger action needs to be dismissed.
    This patch changes zfcp_erp_action_dismiss() so that it dismisses actions
    regardless of their list affiliation. The ERP thread is able to handle this.
    It is important to kick the erp thread only for actions in the running list,
    though, as an imbalance of wakeup signals would confuse the erp thread
    Signed-off-by: Martin Peschke <[EMAIL PROTECTED]>
    Acked-by: Swen Schillig <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
 drivers/s390/scsi/zfcp_erp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 5552b75..ad5b481 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -977,7 +977,9 @@ static void zfcp_erp_action_dismiss(struct zfcp_erp_action 
        debug_text_event(adapter->erp_dbf, 2, "a_adis");
        debug_event(adapter->erp_dbf, 2, &erp_action->action, sizeof (int));
-       zfcp_erp_async_handler_nolock(erp_action, ZFCP_STATUS_ERP_DISMISSED);
+       erp_action->status |= ZFCP_STATUS_ERP_DISMISSED;
+       if (zfcp_erp_action_exists(erp_action) == ZFCP_ERP_ACTION_RUNNING)
+               zfcp_erp_action_ready(erp_action);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to