Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3067562imm; Sun, 1 Jul 2018 11:29:24 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIR3yIJKxjamINP9S1BIeE6cUoZYFD/AaA10NMr2PKZU2iXxzc/qdM2nNmMMjZDEmbtYb1I X-Received: by 2002:a17:902:9a06:: with SMTP id v6-v6mr22937276plp.21.1530469763939; Sun, 01 Jul 2018 11:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530469763; cv=none; d=google.com; s=arc-20160816; b=tlFniovmza3DLX6RJQovXRY9c/tRTI1CphAqDN1zqT7I/GKbClhlAYU49Px57ItHe0 ktVCDLEbFHZHypkIq61jDSP6VJnJuNo2hZzIst4A5vCwnP5JBqN/ReoOjvreJH9iIx4N 1sFt8pgTiZVVn/3Gij61q5lshXkNcXSy6pgj1c6gotoSNLLxDJTdauX9XskBivrkbze4 wexIIsgQSHmm2lR2nKQKu3GL8rNl7FN7cvxdNP259snuaZcrbF2GFIptHKQuh8iFOnKW HsSFjtnAglcw2W4Tld5PUY8Cor68NNf0R3eZBVMdYPxI+zDHfRqbzX5QSGAvHP1i85eB yu/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=IqRiue78K5gcmy0wqNIBdEEo718OJZa3V4dS0i8JB9I=; b=Fg8KGy6Z9+63JB8AddXpgb0Z+JyVa+eYy9kzLF2hqWKpbxsxRMvJ1BVbXl95EnYvyf 9mI5TNFPoMDKUuXeCKl+dSyMnO14t/rSPYRrjPkFmZh4d9Q9u2SvrplGtawGbw2KO0rU Hm+GpE0lRjQ6iCqIseAkEhO2JQsuNgl/DCq1haizwGFd1vtvQ4qFQuZ7fmRlKeHP2rCe VsLA0meMYlVG59dUZuKGux4tVvVrxH79CuM0lCGJ1yQx+1FqwR83fCJxDk/oIh0X6PuD vlN38B0dU4zU04m8yGNYyozbDGFvagGrmp+2jskVxBysL/UprLjcUdwVL2OMXnfz7LV9 g7+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10-v6si12186241pgc.261.2018.07.01.11.29.09; Sun, 01 Jul 2018 11:29:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965326AbeGAS11 (ORCPT + 99 others); Sun, 1 Jul 2018 14:27:27 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:32958 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964888AbeGAQSI (ORCPT ); Sun, 1 Jul 2018 12:18:08 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 16CDC49B; Sun, 1 Jul 2018 16:18:07 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Maier , Benjamin Block , "Martin K. Petersen" Subject: [PATCH 4.4 070/105] scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread Date: Sun, 1 Jul 2018 18:02:20 +0200 Message-Id: <20180701153154.559454493@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180701153149.382300170@linuxfoundation.org> References: <20180701153149.382300170@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steffen Maier commit 6a76550841d412330bd86aed3238d1888ba70f0e upstream. Example trace record formatted with zfcpdbf from s390-tools: Timestamp : ... Area : REC Subarea : 00 Level : 1 Exception : - CPU ID : .. Caller : 0x... Record ID : 1 ZFCP_DBF_REC_TRIG Tag : ....... LUN : 0x... WWPN : 0x... D_ID : 0x... Adapter status : 0x... Port status : 0x... LUN status : 0x... Ready count : 0x... Running count : 0x... ERP want : 0x0. ZFCP_ERP_ACTION_REOPEN_... ERP need : 0xc0 ZFCP_ERP_ACTION_NONE Signed-off-by: Steffen Maier Cc: #2.6.38+ Reviewed-by: Benjamin Block Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/s390/scsi/zfcp_erp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -314,8 +314,11 @@ static int zfcp_erp_action_enqueue(int w goto out; } - if (!adapter->erp_thread) - return -EIO; + if (!adapter->erp_thread) { + need = ZFCP_ERP_ACTION_NONE; /* marker for trace */ + retval = -EIO; + goto out; + } need = zfcp_erp_required_act(want, adapter, port, sdev); if (!need)