From patchwork Fri Jun 9 05:17:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 105274 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp734232vqr; Thu, 8 Jun 2023 22:58:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6x3ouHbwfE4DRqqyEML7WG67VFwbaEouzj3PshFPue5nTOaPS+hChVCFlYBsCB0KqMU9nJ X-Received: by 2002:a05:6808:601:b0:398:ad87:2dab with SMTP id y1-20020a056808060100b00398ad872dabmr677223oih.5.1686290284645; Thu, 08 Jun 2023 22:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686290284; cv=none; d=google.com; s=arc-20160816; b=dFSrceTiVI8M1GaN8G0safYsuGRx/F58eMmoPGrUKAeqpoeN/NbYqYiCkDetj07XQO S0Kc8LjGA9PXpbeci2VlWnqwp1BUYeb8/BrW0QmZPU8hk9N2TtgpmtFV864N29UOHWiP jrkzF4Um3Z8W0c3+woD5ca34EuRsOlHS8UKGPj2OhF8YDWmH30yFXJ26BnojojHId9VK V9b90it18ED0X5Sa0vArPIFghuoAlzPlYP6OARl+kaXZdQiUh3mRAJNCTGJoSw4koDKa uOYemSf8pE+m9+uFdHwzC8TYc4VhxsWhPahnTAQ3WWdui/5sC3/13IiQhtl3dyc9//ag +F0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=FjYMyKYq6juQYF/VuiuxQCYPCQosF6Tr+IRKaAznDZc=; b=geO5yhylRxXa72PkDptKlKlBIGjZfaLgCqOFy2/OYbPniPVzR7kEgrxDMVV7XUx/w+ M9VYYEsO5YE/mcKAxlQAmMNfqUI1/ipayjhGojnlsspe6SbOCF1Te0HSf+eqZIcvReOo OItbpZPH4RfQKTHG2ns/kJjYV6eUiFwzi3kfwJUDBqGa2ftnXRxVprLiLqDwK19RGVZM yzv76TP4pb/YScIGG2mDAzRB8gFkplMYa3/ytjsPnY6S/U2JSMydSjZlGNirCOUHb09k wEcqcmGfpA11KY7Q2I5MNKk/HbcPcMx/V4l0xBazPjdHnVpuMiIh4muP+6Kja22bngRI E+oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=thuIu5Dy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il14-20020a17090b164e00b0025346cf794dsi2284548pjb.134.2023.06.08.22.57.48; Thu, 08 Jun 2023 22:58:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=thuIu5Dy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230090AbjFIFRs (ORCPT + 99 others); Fri, 9 Jun 2023 01:17:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjFIFRq (ORCPT ); Fri, 9 Jun 2023 01:17:46 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5BB82D68 for ; Thu, 8 Jun 2023 22:17:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=FjYMyKYq6juQYF/VuiuxQCYPCQosF6Tr+IRKaAznDZc=; b=thuIu5DyMUNPC4p08f9hTDoNYd M1u06I7ov1vrMXVobNEGB1QR/1iK7aOy159iYfK6/4YegJSyXl8mJo2O3MiduxP8sqRtOL5ujljmK r6kru5Ay4JUI9KjZqtmr9leja1obZZolZDNCJl5C9vgNTgVydA+A5th/wI1JxySHK+Wy/rdYeb0/3 cJRhjlUai9tYpre+xEERURHGNiFaS8IcXyqy+H2fTKvPLBD923FDQSHRSsEDqyJRdwdAXphxh2/2T +W87AXax2SGfLvVCP4Tm6VgRVojH4hIOYbusDIHFVJyYcW8uKjFuEMxfP6zr4oUxzBOr+Fxi3iqR2 Az7Lauzg==; Received: from [213.208.157.39] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q7UVK-00Bhez-0e; Fri, 09 Jun 2023 05:17:42 +0000 From: Christoph Hellwig To: axboe@kernel.dk Cc: festevam@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] block: fix rootwait= again Date: Fri, 9 Jun 2023 07:17:37 +0200 Message-Id: <20230609051737.328930-1-hch@lst.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768203521753854044?= X-GMAIL-MSGID: =?utf-8?q?1768203521753854044?= The previous rootwait fix added an -EINVAL return to a completely bogus superflous branch, fix this. Fixes: 1341c7d2ccf4 ("block: fix rootwait=") Reported-by: Mark Brown Signed-off-by: Christoph Hellwig Tested-by: Fabio Estevam Tested-by: Mark Brown Tested-by: Marek Szyprowski --- block/early-lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/early-lookup.c b/block/early-lookup.c index 48ea3e982419cc..a5be3c68ed079c 100644 --- a/block/early-lookup.c +++ b/block/early-lookup.c @@ -181,7 +181,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt) *p = '\0'; *devt = blk_lookup_devt(s, part); if (*devt) - return -ENODEV; + return 0; /* try disk name without p */ if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')