Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3058162imm; Sun, 1 Jul 2018 11:15:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKEBtXBmWevk/rjq2jlDZS+p9loRMmOzIqnAZQ68TGzhJCzDiRx/vAxzy1+y92wU2f6O0cw X-Received: by 2002:a17:902:4c88:: with SMTP id b8-v6mr22226786ple.285.1530468930972; Sun, 01 Jul 2018 11:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530468930; cv=none; d=google.com; s=arc-20160816; b=kDj64OBXbP8kf6snFyH8Nqt3sTSc058gc5x3t7V3nnn//+Q4L9vMEZv7mloW5gUHNS erWnh2jbYEiBSNCAhXarOUH9rM7Udd9MHAPcdZSm5vQkWp13WGIhO+EvARkU4snj3s02 h895T9uuMM+9jQAlqq96dLoDQYlVR0tYbE31Ys60lJ1QcECqCAPqUwIGBuOaYFXFjyK4 Nnn0a0Vd9o2HY1dXpAXjL+EGf/K6BUEYOK3FXpUgF57abVzWvEZ49FqmH2fxq0NZZRKf 2XUAg6EyzmDqjIGEaGHwf9ILgakHmY3Nx2V0lzN0RK+jPMGrdf/I2lwn+6170YBo3m9c GqnA== 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=EOOjnvgm2pWo8fKKMi0JbVh/mkMtY9Bv7KQaqhOX9XM=; b=yBYK5qQeyU0XDQkOd9TqrvqOORnMjCiXMLa80FHQpq2Pi3dtc9KiwzSB17uyiUawmI J3De9C4pqzYCjm5Fwmuj/8qoLI+X553y5b9SeNh2uM7hTy/wl8vJ6GjWyW8Bq8e35gYn R7ZgwfbdBv5xrkrOeINiO/xYTdP/l1R85EmfKLEPz0N/I0lx8atMiy4FLN4Wchmh+9Mg l1BA2y/ZsiREoYXjq9IxqyhUOX+NxPa2MfE4BwJF+GJz4Vf2nZ5P/ix8pANEJoLY9E+e fcrYt2YYjTGz6+Ak+pAwi9+Hqh2UM4aqGa7fU6YrAXBm9AnSCoFFRZdhaFdpZlIjgbiK 4SHg== 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 a20-v6si393051pgb.600.2018.07.01.11.15.16; Sun, 01 Jul 2018 11:15:30 -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 S965547AbeGASNk (ORCPT + 99 others); Sun, 1 Jul 2018 14:13:40 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34020 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965349AbeGAQ1E (ORCPT ); Sun, 1 Jul 2018 12:27:04 -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 BB58E92B; Sun, 1 Jul 2018 16:27:03 +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.9 063/101] scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread Date: Sun, 1 Jul 2018 18:21:49 +0200 Message-Id: <20180701160759.683484589@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180701160757.138608453@linuxfoundation.org> References: <20180701160757.138608453@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.9-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)