From: Christoph Hellwig <hch@lst.de>
To: linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>, Song Liu <song@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 01/17] init: remove the bstat helper
Date: Thu, 9 Jul 2020 17:17:58 +0200 [thread overview]
Message-ID: <20200709151814.110422-2-hch@lst.de> (raw)
In-Reply-To: <20200709151814.110422-1-hch@lst.de>
The only caller of the bstat function becomes cleaner and simpler when
open coding the function.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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));
}
-static inline u32 bstat(char *name)
-{
- struct kstat stat;
- if (vfs_stat(name, &stat) != 0)
- return 0;
- if (!S_ISBLK(stat.mode))
- return 0;
- return stat.rdev;
-}
-
#ifdef CONFIG_BLK_DEV_RAM
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 = MKDEV(MD_MAJOR, minor);
create_dev(name, dev);
for (i = 0; i < MD_SB_DISKS && devname != NULL; i++) {
+ struct kstat stat;
char *p;
char comp_name[64];
- u32 rdev;
p = strchr(devname, ',');
if (p)
@@ -150,9 +150,9 @@ static void __init md_setup_drive(void)
if (strncmp(devname, "/dev/", 5) == 0)
devname += 5;
snprintf(comp_name, 63, "/dev/%s", devname);
- rdev = bstat(comp_name);
- if (rdev)
- dev = new_decode_dev(rdev);
+ if (vfs_stat(comp_name, &stat) == 0 &&
+ S_ISBLK(stat.mode))
+ dev = new_decode_dev(stat.rdev);
if (!dev) {
printk(KERN_WARNING "md: Unknown device name: %s\n", devname);
break;
--
2.26.2
next prev parent reply other threads:[~2020-07-09 15:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 15:17 decruft the early init / initrd / initramfs code v2 Christoph Hellwig
2020-07-09 15:17 ` Christoph Hellwig [this message]
2020-07-09 15:17 ` [PATCH 02/17] md: move the early init autodetect code to drivers/md/ Christoph Hellwig
2020-07-09 15:18 ` [PATCH 03/17] md: replace the RAID_AUTORUN ioctl with a direct function call Christoph Hellwig
2020-07-09 15:18 ` [PATCH 04/17] md: remove the autoscan partition re-read Christoph Hellwig
2020-07-09 15:18 ` [PATCH 05/17] md: remove the kernel version of md_u.h Christoph Hellwig
2020-07-09 15:18 ` [PATCH 06/17] md: simplify md_setup_drive Christoph Hellwig
2020-07-09 15:18 ` [PATCH 07/17] md: rewrite md_setup_drive to avoid ioctls Christoph Hellwig
2020-07-09 15:18 ` [PATCH 08/17] initrd: remove support for multiple floppies Christoph Hellwig
2020-07-09 15:18 ` [PATCH 09/17] initrd: remove the BLKFLSBUF call in handle_initrd Christoph Hellwig
2020-07-09 15:18 ` [PATCH 10/17] initrd: switch initrd loading to struct file based APIs Christoph Hellwig
2020-07-09 15:18 ` [PATCH 11/17] initrd: mark init_linuxrc as __init Christoph Hellwig
2020-07-09 15:18 ` [PATCH 12/17] initrd: mark initrd support as deprecated Christoph Hellwig
2020-07-09 15:18 ` [PATCH 13/17] initramfs: remove the populate_initrd_image and clean_rootfs stubs Christoph Hellwig
2020-07-09 15:18 ` [PATCH 14/17] initramfs: simplify clean_rootfs Christoph Hellwig
2020-07-09 15:18 ` [PATCH 15/17] initramfs: switch initramfs unpacking to struct file based APIs Christoph Hellwig
2020-07-09 18:07 ` Linus Torvalds
2020-07-09 18:12 ` Christoph Hellwig
2020-07-09 18:23 ` Linus Torvalds
2020-07-09 15:18 ` [PATCH 16/17] init: open code setting up stdin/stdout/stderr Christoph Hellwig
2020-07-09 18:32 ` Brian Gerst
2020-07-09 15:18 ` [PATCH 17/17] fs: remove ksys_open Christoph Hellwig
2020-07-09 18:08 ` decruft the early init / initrd / initramfs code v2 Linus Torvalds
2020-07-09 23:32 ` hpa
2020-07-14 6:41 ` Christoph Hellwig
2020-07-14 16:20 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709151814.110422-2-hch@lst.de \
--to=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=song@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).