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=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 D3219C433E2 for ; Wed, 15 Jul 2020 23:14:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BABC32067D for ; Wed, 15 Jul 2020 23:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726941AbgGOXOg (ORCPT ); Wed, 15 Jul 2020 19:14:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:45596 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726776AbgGOXOg (ORCPT ); Wed, 15 Jul 2020 19:14:36 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 910D0AB76; Wed, 15 Jul 2020 23:14:38 +0000 (UTC) From: NeilBrown To: Christoph Hellwig , linux-kernel@vger.kernel.org Date: Thu, 16 Jul 2020 09:14:28 +1000 Cc: "H. Peter Anvin" , Song Liu , Al Viro , Linus Torvalds , linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 03/23] init: remove the bstat helper In-Reply-To: <20200714190427.4332-4-hch@lst.de> References: <20200714190427.4332-1-hch@lst.de> <20200714190427.4332-4-hch@lst.de> Message-ID: <87h7u8xtez.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, Jul 14 2020, Christoph Hellwig wrote: > The only caller of the bstat function becomes cleaner and simpler when > open coding the function. > > Signed-off-by: Christoph Hellwig > Acked-by: Song Liu Reviewed-by: NeilBrown Nice! NeilBrown > --- > init/do_mounts.h | 10 ---------- > init/do_mounts_md.c | 8 ++++---- > 2 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/init/do_mounts.h b/init/do_mounts.h > index 0bb0806de4ce2c..7513d1c14d13fe 100644 > --- a/init/do_mounts.h > +++ b/init/do_mounts.h > @@ -20,16 +20,6 @@ static inline int create_dev(char *name, dev_t dev) > return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev)); > } >=20=20 > -static inline u32 bstat(char *name) > -{ > - struct kstat stat; > - if (vfs_stat(name, &stat) !=3D 0) > - return 0; > - if (!S_ISBLK(stat.mode)) > - return 0; > - return stat.rdev; > -} > - > #ifdef CONFIG_BLK_DEV_RAM >=20=20 > int __init rd_load_disk(int n); > diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c > index b84031528dd446..359363e85ccd0b 100644 > --- a/init/do_mounts_md.c > +++ b/init/do_mounts_md.c > @@ -138,9 +138,9 @@ static void __init md_setup_drive(void) > dev =3D MKDEV(MD_MAJOR, minor); > create_dev(name, dev); > for (i =3D 0; i < MD_SB_DISKS && devname !=3D NULL; i++) { > + struct kstat stat; > char *p; > char comp_name[64]; > - u32 rdev; >=20=20 > p =3D strchr(devname, ','); > if (p) > @@ -150,9 +150,9 @@ static void __init md_setup_drive(void) > if (strncmp(devname, "/dev/", 5) =3D=3D 0) > devname +=3D 5; > snprintf(comp_name, 63, "/dev/%s", devname); > - rdev =3D bstat(comp_name); > - if (rdev) > - dev =3D new_decode_dev(rdev); > + if (vfs_stat(comp_name, &stat) =3D=3D 0 && > + S_ISBLK(stat.mode)) > + dev =3D new_decode_dev(stat.rdev); > if (!dev) { > printk(KERN_WARNING "md: Unknown device name: %s\n", devname); > break; > --=20 > 2.27.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEG8Yp69OQ2HB7X0l6Oeye3VZigbkFAl8PjdQACgkQOeye3VZi gbnOgBAAg5tYGuw1TVkG+Rso30FARvah0yhwFOfZKWKl4XLVRV9xmx+b6bklDYL9 WqtyGlYlvwkyoIhMw+SPMwaswAXHj+g/IB657EdpcZrWsHJ2M0pPwpLgFLmScPL5 XCx93C0ZEVbbL+TvBh/SVssGpvbo6XCH2YdYNqP46AwSf8iEBDK/6zKW8yXVynzO F7C2DmXOchXEhitgHtx15XZPJ1M1rgAasTBgbZGIz0HmFRDjR3M8Q/uMELNBpQlp nl/rcoaZPUmubi1n9yDHyyNE5RaV9v1o/u0JuIt6gU6N64Nd1LyVJWMQVueItRDN t9zjq2UNqC7vvclHvmTAZPzIXZnqANV2Dniiz5d+iEhFnlnlMI8Oy+3y2vJiMRzL y1AHv53G3UgA1SLLQtGZYNynCRtg3QAG3z6ljNFiNgq/VcJou4dJFjyO8TB6RqWo FGvGU1UxmR5N5S92vj/ZPq09iC97OAQoarS6/zbwW2PY+xDYc9OyWSS8C2Twoaqa vjnUZS9Qk9mTARyX/69Qhn8QGiGyHd04BYSsLZNJ71ayAgIocC7vJNMR0NrKtYFf JgCRbAvOzDGOFkdcRhJXaJv0PTvJBW278LS4E4Ithim9aFrXh1Az4zxN/S4OP+Ch zXqUPaG3yN2pHC+5hnFB3bxWYqRkkolTXIPwHe7W9JpHrpcR4ik= =EyQS -----END PGP SIGNATURE----- --=-=-=--