Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3308989imu; Sun, 11 Nov 2018 12:05:15 -0800 (PST) X-Google-Smtp-Source: AJdET5doz2b0rn1ehuW71luyxjGkI5bdZq6pO5ZKY9Ke36wiVUX7Avjcl2WRYRcbuAZNSIyheNvb X-Received: by 2002:a62:e30a:: with SMTP id g10-v6mr17379815pfh.151.1541966715895; Sun, 11 Nov 2018 12:05:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541966715; cv=none; d=google.com; s=arc-20160816; b=Vq78waIS7iv5J5q3aN0+/UWeWwv9dh4isvBCY516QWAWH7TLzrQDgdfS23LBqIQGVt f1WxVqe3faErVEzNcvEuZrnjWKkF7gDNoWuO/+7LFcVCZSAHIY9oc3VZbQiIqjRgOaff HQ5820tnpqsXA5b14HufkNXFq2wAonBMbuuc8yU4Gg/pCkynShRcGaxCegLy1GJ87M18 MXza3uXaxLWAStaj2d8u3nDjCQrD+hk8g+Dnm9/hCxoA4SpRLjBSpaDRmpVQKTJogbnR i9nUuWCKLe5dM55Mb8qkWYBnTOq1kc9MnvIl92VYk/mRyyySNJQdx6waR2xI5LGjx366 hWmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=X7C0KVXwdk6ChuU5xL0gfltkfjvgC5IuN9TdH+mW9KQ=; b=JbJMBFEs0DPOLv8Btkm6EPZN1BmtN17kEXx7JOQlZxt974PUJY9hL0YQW2rQIt5mts I8/jCRvd3W/k+Q/TXn5L/rc7svY7ruUsRH+znElCrwTVi1aNEelBffnCguTi0yiZaVLE lfIv0K/5HNrBgrFvWHmPDso2ZTWohVk5sFaCrF632tnsg9fQTx9W/3IwpC+1jKyf53vQ iQGI9M+S5M+uNLYBU6fx3a4rEgeZHLO7magI+dbAvdVCiybZViHQXb57OgRK2kjKC41A 2Gd62okOXUY/4VaAKQSD30zmESwnsIY+e1k61e81Bj7xhvyP9PR2HzZWgtxJ6t/Ea/x2 QVZA== 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 b9-v6si13432339pgq.589.2018.11.11.12.05.00; Sun, 11 Nov 2018 12:05:15 -0800 (PST) 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 S1730984AbeKLFxZ (ORCPT + 99 others); Mon, 12 Nov 2018 00:53:25 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:51588 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730699AbeKLFxZ (ORCPT ); Mon, 12 Nov 2018 00:53:25 -0500 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gLvt9-0000oG-9m; Sun, 11 Nov 2018 19:59:19 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gLvsP-0001RL-IE; Sun, 11 Nov 2018 19:58:33 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Martin K. Petersen" , "Steffen Maier" , "Benjamin Block" Date: Sun, 11 Nov 2018 19:49:05 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 066/366] scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.61-rc1 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 Reviewed-by: Benjamin Block Signed-off-by: Martin K. Petersen Signed-off-by: Ben Hutchings --- 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)