From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8903EC04A6A for ; Sun, 13 Aug 2023 16:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233050AbjHMQVc (ORCPT ); Sun, 13 Aug 2023 12:21:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbjHMQV3 (ORCPT ); Sun, 13 Aug 2023 12:21:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E484199B; Sun, 13 Aug 2023 09:21:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3AD7763B6E; Sun, 13 Aug 2023 16:12:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2D94C433C9; Sun, 13 Aug 2023 16:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691943160; bh=xiTGrDSYlvcJnKr0wiRPk4nN3jl03MAp7/ZN2W90s8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=auf2eV46Q3ju3VKZy/VDcf0d6LN2QawDmcilx3TEJwEVcvtYthjYtKwE3OltsQind fFfuTY3INmVWy14Z1vkEnQenFpiT8chwMPr54Weyun0B0708OmLyv1e9hg+ntLMeFS hpzTZKd3SgKkSxA7WtmoyqGVYXopEhzytrxo8trHYMcY0Dz3Z9X1uaR90RurBNBWS3 Mt+d3KWzmB/ghMbKfpTMieLVEYvbX6ACzXpbklyXz+tvtAXYdFj3y4cnjugvpSisUQ wmqOK21ZZdlJYaVNQvgVpvJxltchfEEa4kr25tdZIMlVmlSQTB4g1Hssvl8Fc/4NKr B1pWjg57bbAQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Haberland , Jan Hoeppner , Jens Axboe , Sasha Levin , hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 07/14] s390/dasd: use correct number of retries for ERP requests Date: Sun, 13 Aug 2023 12:11:55 -0400 Message-Id: <20230813161202.1086004-7-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813161202.1086004-1-sashal@kernel.org> References: <20230813161202.1086004-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.253 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stefan Haberland [ Upstream commit acea28a6b74f458defda7417d2217b051ba7d444 ] If a DASD request fails an error recovery procedure (ERP) request might be built as a copy of the original request to do error recovery. The ERP request gets a number of retries assigned. This number is always 256 no matter what other value might have been set for the original request. This is not what is expected when a user specifies a certain amount of retries for the device via sysfs. Correctly use the number of retries of the original request for ERP requests. Signed-off-by: Stefan Haberland Reviewed-by: Jan Hoeppner Link: https://lore.kernel.org/r/20230721193647.3889634-3-sth@linux.ibm.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/s390/block/dasd_3990_erp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index ee73b0607e47c..8598c792ded30 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c @@ -2436,7 +2436,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) erp->block = cqr->block; erp->magic = cqr->magic; erp->expires = cqr->expires; - erp->retries = 256; + erp->retries = device->default_retries; erp->buildclk = get_tod_clock(); erp->status = DASD_CQR_FILLED; -- 2.40.1