From 3bb4e673b91efd351f3fd63346e72de9f156a718 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Mon, 10 Mar 2008 16:18:54 +0100 Subject: [PATCH] --- yaml --- r: 89671 b: refs/heads/master c: 5c815d1501a9ce84578cb3ec64c9d31ef91e3de2 h: refs/heads/master i: 89669: d402a8f72a9ea6b7412e6662a5d653fde36427cf 89667: 3a48dbcf8234d175e659eec784da381d1cbb0ef4 89663: 56db4ca57bdbe78bab64f5a6cf56e4fa8e72bf55 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_fsf.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7ae13c347fc8..d4ea2bc581ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2505873afe510d8db05665684c056ac8f0b24563 +refs/heads/master: 5c815d1501a9ce84578cb3ec64c9d31ef91e3de2 diff --git a/trunk/drivers/s390/scsi/zfcp_fsf.c b/trunk/drivers/s390/scsi/zfcp_fsf.c index 0dff05840ee2..2ed3c7b48882 100644 --- a/trunk/drivers/s390/scsi/zfcp_fsf.c +++ b/trunk/drivers/s390/scsi/zfcp_fsf.c @@ -2968,6 +2968,13 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req) zfcp_erp_port_boxed(port); fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR | ZFCP_STATUS_FSFREQ_RETRY; + + /* can't use generic zfcp_erp_modify_port_status because + * ZFCP_STATUS_COMMON_OPEN must not be reset for the port */ + atomic_clear_mask(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status); + list_for_each_entry(unit, &port->unit_list_head, list) + atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN, + &unit->status); break; case FSF_ADAPTER_STATUS_AVAILABLE: