[SCSI] zfcp: Remove two FIXME comments

On a link down, the adapter reopen is not strictly necessary, but it
helps flushing pending requests as quickly as possible. Add a comment
mentioning this.

qdio returning a problem on the response queue is an unlikely event.
The recovery mentioned in the comment might resolve it, so implement
it. This also has the advantage that it creates an entry in the
recovery trace to see if and when this is occurring.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 36a6f4a7b8d7876218677b907d1bbbbf4be507e7..e5ff45fbb8ae7ac8051226209fba4318ecd1b83e 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -394,7 +394,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
        case FSF_PROT_LINK_DOWN:
                zfcp_fsf_link_down_info_eval(req, "fspse_5",
                                             &psq->link_down_info);
-               /* FIXME: reopening adapter now? better wait for link up */
+               /* go through reopen to flush pending requests */
                zfcp_erp_adapter_reopen(adapter, 0, "fspse_6", req);
                break;
        case FSF_PROT_REEST_QUEUE:

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 6c5228b627fc540bac927019bf0fb829bb9d4bf8..3d329fa3d094da532380ad3c2f4f74e07bbce2ba 100644 (file)
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -106,7 +106,7 @@ static void zfcp_qdio_resp_put_back(struct zfcp_qdio *qdio, int processed)
 
        if (unlikely(retval)) {
                atomic_set(&queue->count, count);
-               /* FIXME: Recover this with an adapter reopen? */
+               zfcp_erp_adapter_reopen(qdio->adapter, 0, "qdrpb_1", NULL);
        } else {
                queue->first += count;
                queue->first %= QDIO_MAX_BUFFERS_PER_Q;