From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Sep 2017 06:28:54 +0000 (+0200)
Subject: fix up s390 build error for 3.18
X-Git-Tag: v3.18.72~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60a650ff81cc658029b4ebf4ad0783b934896720;p=thirdparty%2Fkernel%2Fstable-queue.git

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 de978b17110..c8efd169a15 100644
--- 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;
 +	}