fix up s390 build error for 3.18

diff --git a/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch b/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch
index de978b1711004b91376c4e1fd36d7687cb7df3d8..c8efd169a154d6da2a0e5b9f5b2e1d0b26a5e7b0 100644 (file)
--- a/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch
+++ b/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                ret = fc_block_scsi_eh(scpnt);
 -              if (ret)
 +              if (ret) {
-+                      zfcp_dbf_scsi_devreset("fiof", scpnt, tm_flags, NULL);
++                      zfcp_dbf_scsi_devreset("fiof", scpnt, tm_flags);
                        return ret;
 +              }
  
@@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        }
 -      if (!fsf_req)
 +      if (!fsf_req) {
-+              zfcp_dbf_scsi_devreset("reqf", scpnt, tm_flags, NULL);
++              zfcp_dbf_scsi_devreset("reqf", scpnt, tm_flags);
                return FAILED;
 +      }