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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19164C63777 for ; Sat, 28 Nov 2020 16:16:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C087E2467C for ; Sat, 28 Nov 2020 16:16:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fgmp24RU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C087E2467C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 00D8C8D001B; Sat, 28 Nov 2020 11:15:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EDCBE8D0017; Sat, 28 Nov 2020 11:15:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B30E28D001C; Sat, 28 Nov 2020 11:15:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 8D0018D0017 for ; Sat, 28 Nov 2020 11:15:56 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4EDDA3637 for ; Sat, 28 Nov 2020 16:15:56 +0000 (UTC) X-FDA: 77534328312.16.hall16_420d74c27392 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 32A5D100E690B for ; Sat, 28 Nov 2020 16:15:56 +0000 (UTC) X-HE-Tag: hall16_420d74c27392 X-Filterd-Recvd-Size: 3546 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 16:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=h5jD3nKoGxX1nrfDFkuFqjmtZeLc4uJpqdz/BICw9t8=; b=fgmp24RUJmNWs5vmYunYdOF9uI 7aIptjG0v7E3FCIKtohhpCVQpuVi0CCkMg5e46JiaUInW2L1Pdu1AaaoyP862JHsMWbISr6e9hgYA OGJYYiky1OLBZEvERUX9cbqkIQ1qK/cuMtZCyeEfaYlVpr4lC89ujf9j2Ra/NpNjsn0g/z0vlZn/S P8NcKCWzxHRy6XrfdisHwiijEDSsHH9Kh6pLyV2MgUI583FqqJwrqZSB6tWf/kRJYaAdIyhCruU75 PKbLl5YOpRlEfpd7QMPGgxs/XFkDilEGDLbaZnoMOOEb3+/lGK83tY/JEwJesmc0zVX+b4VXJq5/G xQVTjCMA==; Received: from [2001:4bb8:18c:1dd6:48f3:741a:602e:7fdd] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj2sw-0000HB-Gj; Sat, 28 Nov 2020 16:15:42 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 19/45] init: cleanup match_dev_by_uuid and match_dev_by_label Date: Sat, 28 Nov 2020 17:14:44 +0100 Message-Id: <20201128161510.347752-20-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Avoid a totally pointless goto label, and use the same style of comparism for both helpers. Signed-off-by: Christoph Hellwig Reviewed-by: Greg Kroah-Hartman Reviewed-by: Jan Kara Reviewed-by: Johannes Thumshirn Acked-by: Tejun Heo --- init/do_mounts.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index afa26a4028d25e..5879edf083b318 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -79,15 +79,10 @@ static int match_dev_by_uuid(struct device *dev, cons= t void *data) const struct uuidcmp *cmp =3D data; struct hd_struct *part =3D dev_to_part(dev); =20 - if (!part->info) - goto no_match; - - if (strncasecmp(cmp->uuid, part->info->uuid, cmp->len)) - goto no_match; - + if (!part->info || + strncasecmp(cmp->uuid, part->info->uuid, cmp->len)) + return 0; return 1; -no_match: - return 0; } =20 /** @@ -174,10 +169,9 @@ static int match_dev_by_label(struct device *dev, co= nst void *data) const char *label =3D data; struct hd_struct *part =3D dev_to_part(dev); =20 - if (part->info && !strcmp(label, part->info->volname)) - return 1; - - return 0; + if (!part->info || strcmp(label, part->info->volname)) + return 0; + return 1; } =20 static dev_t devt_from_partlabel(const char *label) --=20 2.29.2