Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: NeilBrown <neil@brown.name>
To: Christoph Hellwig <hch@lst.de>, 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: Re: [PATCH 08/23] md: simplify md_setup_drive
Date: Thu, 16 Jul 2020 09:37:40 +1000 [thread overview]
Message-ID: <875zaoxscb.fsf@notabene.neil.brown.name> (raw)
In-Reply-To: <20200714190427.4332-9-hch@lst.de>
[-- Attachment #1: Type: text/plain, Size: 7818 bytes --]
On Tue, Jul 14 2020, Christoph Hellwig wrote:
> Move the loop over the possible arrays into the caller to remove a level
> of indentation for the whole function.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Acked-by: Song Liu <song@kernel.org>
Nice
Reviewed-by: NeilBrown <neilb@suse.de>
Thanks,
NeilBrown
> ---
> drivers/md/md-autodetect.c | 203 ++++++++++++++++++-------------------
> 1 file changed, 101 insertions(+), 102 deletions(-)
>
> diff --git a/drivers/md/md-autodetect.c b/drivers/md/md-autodetect.c
> index 6bc9b734eee6ff..a43a8f1580584c 100644
> --- a/drivers/md/md-autodetect.c
> +++ b/drivers/md/md-autodetect.c
> @@ -27,7 +27,7 @@ static int __initdata raid_noautodetect=1;
> #endif
> static int __initdata raid_autopart;
>
> -static struct {
> +static struct md_setup_args {
> int minor;
> int partitioned;
> int level;
> @@ -126,122 +126,117 @@ static inline int create_dev(char *name, dev_t dev)
> return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
> }
>
> -static void __init md_setup_drive(void)
> +static void __init md_setup_drive(struct md_setup_args *args)
> {
> - int minor, i, ent, partitioned;
> + int minor, i, partitioned;
> dev_t dev;
> dev_t devices[MD_SB_DISKS+1];
> + int fd;
> + int err = 0;
> + char *devname;
> + mdu_disk_info_t dinfo;
> + char name[16];
>
> - for (ent = 0; ent < md_setup_ents ; ent++) {
> - int fd;
> - int err = 0;
> - char *devname;
> - mdu_disk_info_t dinfo;
> - char name[16];
> + minor = args->minor;
> + partitioned = args->partitioned;
> + devname = args->device_names;
>
> - minor = md_setup_args[ent].minor;
> - partitioned = md_setup_args[ent].partitioned;
> - devname = md_setup_args[ent].device_names;
> + sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor);
> + if (partitioned)
> + dev = MKDEV(mdp_major, minor << MdpMinorShift);
> + else
> + 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];
>
> - sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor);
> - if (partitioned)
> - dev = MKDEV(mdp_major, minor << MdpMinorShift);
> - else
> - 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];
> + p = strchr(devname, ',');
> + if (p)
> + *p++ = 0;
>
> - p = strchr(devname, ',');
> - if (p)
> - *p++ = 0;
> + dev = name_to_dev_t(devname);
> + if (strncmp(devname, "/dev/", 5) == 0)
> + devname += 5;
> + snprintf(comp_name, 63, "/dev/%s", devname);
> + 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;
> + }
>
> - dev = name_to_dev_t(devname);
> - if (strncmp(devname, "/dev/", 5) == 0)
> - devname += 5;
> - snprintf(comp_name, 63, "/dev/%s", devname);
> - 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;
> - }
> + devices[i] = dev;
> + devname = p;
> + }
> + devices[i] = 0;
>
> - devices[i] = dev;
> + if (!i)
> + return;
>
> - devname = p;
> - }
> - devices[i] = 0;
> + printk(KERN_INFO "md: Loading md%s%d: %s\n",
> + partitioned ? "_d" : "", minor,
> + args->device_names);
>
> - if (!i)
> - continue;
> + fd = ksys_open(name, 0, 0);
> + if (fd < 0) {
> + printk(KERN_ERR "md: open failed - cannot start "
> + "array %s\n", name);
> + return;
> + }
> + if (ksys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
> + printk(KERN_WARNING
> + "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
> + minor);
> + ksys_close(fd);
> + return;
> + }
>
> - printk(KERN_INFO "md: Loading md%s%d: %s\n",
> - partitioned ? "_d" : "", minor,
> - md_setup_args[ent].device_names);
> + if (args->level != LEVEL_NONE) {
> + /* non-persistent */
> + mdu_array_info_t ainfo;
> + ainfo.level = args->level;
> + ainfo.size = 0;
> + ainfo.nr_disks =0;
> + ainfo.raid_disks =0;
> + while (devices[ainfo.raid_disks])
> + ainfo.raid_disks++;
> + ainfo.md_minor =minor;
> + ainfo.not_persistent = 1;
>
> - fd = ksys_open(name, 0, 0);
> - if (fd < 0) {
> - printk(KERN_ERR "md: open failed - cannot start "
> - "array %s\n", name);
> - continue;
> - }
> - if (ksys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
> - printk(KERN_WARNING
> - "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
> - minor);
> - ksys_close(fd);
> - continue;
> + ainfo.state = (1 << MD_SB_CLEAN);
> + ainfo.layout = 0;
> + ainfo.chunk_size = args->chunk;
> + err = ksys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo);
> + for (i = 0; !err && i <= MD_SB_DISKS; i++) {
> + dev = devices[i];
> + if (!dev)
> + break;
> + dinfo.number = i;
> + dinfo.raid_disk = i;
> + dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC);
> + dinfo.major = MAJOR(dev);
> + dinfo.minor = MINOR(dev);
> + err = ksys_ioctl(fd, ADD_NEW_DISK,
> + (long)&dinfo);
> }
> -
> - if (md_setup_args[ent].level != LEVEL_NONE) {
> - /* non-persistent */
> - mdu_array_info_t ainfo;
> - ainfo.level = md_setup_args[ent].level;
> - ainfo.size = 0;
> - ainfo.nr_disks =0;
> - ainfo.raid_disks =0;
> - while (devices[ainfo.raid_disks])
> - ainfo.raid_disks++;
> - ainfo.md_minor =minor;
> - ainfo.not_persistent = 1;
> -
> - ainfo.state = (1 << MD_SB_CLEAN);
> - ainfo.layout = 0;
> - ainfo.chunk_size = md_setup_args[ent].chunk;
> - err = ksys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo);
> - for (i = 0; !err && i <= MD_SB_DISKS; i++) {
> - dev = devices[i];
> - if (!dev)
> - break;
> - dinfo.number = i;
> - dinfo.raid_disk = i;
> - dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC);
> - dinfo.major = MAJOR(dev);
> - dinfo.minor = MINOR(dev);
> - err = ksys_ioctl(fd, ADD_NEW_DISK,
> - (long)&dinfo);
> - }
> - } else {
> - /* persistent */
> - for (i = 0; i <= MD_SB_DISKS; i++) {
> - dev = devices[i];
> - if (!dev)
> - break;
> - dinfo.major = MAJOR(dev);
> - dinfo.minor = MINOR(dev);
> - ksys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
> - }
> + } else {
> + /* persistent */
> + for (i = 0; i <= MD_SB_DISKS; i++) {
> + dev = devices[i];
> + if (!dev)
> + break;
> + dinfo.major = MAJOR(dev);
> + dinfo.minor = MINOR(dev);
> + ksys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
> }
> - if (!err)
> - err = ksys_ioctl(fd, RUN_ARRAY, 0);
> - if (err)
> - printk(KERN_WARNING "md: starting md%d failed\n", minor);
> - ksys_close(fd);
> }
> + if (!err)
> + err = ksys_ioctl(fd, RUN_ARRAY, 0);
> + if (err)
> + printk(KERN_WARNING "md: starting md%d failed\n", minor);
> + ksys_close(fd);
> }
>
> static int __init raid_setup(char *str)
> @@ -289,11 +284,15 @@ static void __init autodetect_raid(void)
>
> void __init md_run_setup(void)
> {
> + int ent;
> +
> create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
>
> if (raid_noautodetect)
> printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n");
> else
> autodetect_raid();
> - md_setup_drive();
> +
> + for (ent = 0; ent < md_setup_ents; ent++)
> + md_setup_drive(&md_setup_args[ent]);
> }
> --
> 2.27.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2020-07-15 23:37 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 19:04 decruft the early init / initrd / initramfs code v2 Christoph Hellwig
2020-07-14 19:04 ` [PATCH 01/23] fs: add a vfs_fchown helper Christoph Hellwig
2020-07-14 19:04 ` [PATCH 02/23] fs: add a vfs_fchmod helper Christoph Hellwig
2020-07-14 19:04 ` [PATCH 03/23] init: remove the bstat helper Christoph Hellwig
2020-07-15 23:14 ` NeilBrown
2020-07-14 19:04 ` [PATCH 04/23] md: move the early init autodetect code to drivers/md/ Christoph Hellwig
2020-07-14 19:04 ` [PATCH 05/23] md: replace the RAID_AUTORUN ioctl with a direct function call Christoph Hellwig
2020-07-15 23:33 ` NeilBrown
2020-07-14 19:04 ` [PATCH 06/23] md: remove the autoscan partition re-read Christoph Hellwig
2020-07-15 23:34 ` NeilBrown
2020-07-14 19:04 ` [PATCH 07/23] md: remove the kernel version of md_u.h Christoph Hellwig
2020-07-14 19:04 ` [PATCH 08/23] md: simplify md_setup_drive Christoph Hellwig
2020-07-15 23:37 ` NeilBrown [this message]
2020-07-14 19:04 ` [PATCH 09/23] md: rewrite md_setup_drive to avoid ioctls Christoph Hellwig
2020-07-15 23:50 ` NeilBrown
2020-07-16 13:38 ` Christoph Hellwig
2020-07-14 19:04 ` [PATCH 10/23] initrd: remove support for multiple floppies Christoph Hellwig
2020-07-14 19:04 ` [PATCH 11/23] initrd: remove the BLKFLSBUF call in handle_initrd Christoph Hellwig
2020-07-14 19:04 ` [PATCH 12/23] initrd: switch initrd loading to struct file based APIs Christoph Hellwig
2020-07-27 1:50 ` Al Viro
2020-07-14 19:04 ` [PATCH 13/23] initrd: mark init_linuxrc as __init Christoph Hellwig
2020-07-14 19:04 ` [PATCH 14/23] initrd: mark initrd support as deprecated Christoph Hellwig
2020-07-14 19:04 ` [PATCH 15/23] initramfs: remove the populate_initrd_image and clean_rootfs stubs Christoph Hellwig
2020-07-14 19:04 ` [PATCH 16/23] initramfs: simplify clean_rootfs Christoph Hellwig
[not found] ` <CGME20200717205549eucas1p13fca9a8496836faa71df515524743648@eucas1p1.samsung.com>
2020-07-17 20:55 ` Marek Szyprowski
2020-07-18 10:00 ` Christoph Hellwig
2020-07-23 9:22 ` Christoph Hellwig
2020-07-23 14:25 ` Lukasz Stelmach
2020-07-23 14:27 ` Christoph Hellwig
2020-07-27 2:41 ` Al Viro
2020-07-27 2:44 ` Matthew Wilcox
2020-07-14 19:04 ` [PATCH 17/23] initramfs: switch initramfs unpacking to struct file based APIs Christoph Hellwig
2020-07-14 19:31 ` Linus Torvalds
2020-07-15 6:27 ` Christoph Hellwig
2020-07-27 2:55 ` Al Viro
2020-07-14 19:04 ` [PATCH 18/23] init: open code setting up stdin/stdout/stderr Christoph Hellwig
2020-07-27 3:05 ` Al Viro
2020-07-27 5:46 ` Christoph Hellwig
2020-07-27 6:03 ` Al Viro
2020-07-27 6:48 ` Christoph Hellwig
2020-07-27 15:54 ` Al Viro
2020-07-27 15:58 ` Christoph Hellwig
2020-07-27 6:20 ` hpa
2020-07-27 6:24 ` Christoph Hellwig
2020-07-27 6:36 ` hpa
2020-07-27 6:49 ` Christoph Hellwig
2020-07-14 19:04 ` [PATCH 19/23] fs: remove ksys_getdents64 Christoph Hellwig
2020-07-14 19:04 ` [PATCH 20/23] fs: remove ksys_open Christoph Hellwig
2020-07-14 19:04 ` [PATCH 21/23] fs: remove ksys_dup Christoph Hellwig
2020-07-14 19:04 ` [PATCH 22/23] fs: remove ksys_fchmod Christoph Hellwig
2020-07-14 19:04 ` [PATCH 23/23] fs: remove ksys_ioctl Christoph Hellwig
2020-07-14 19:34 ` decruft the early init / initrd / initramfs code v2 Linus Torvalds
2020-07-15 6:51 ` Christoph Hellwig
2020-07-16 15:57 ` Guoqing Jiang
2020-07-16 16:00 ` Christoph Hellwig
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=875zaoxscb.fsf@notabene.neil.brown.name \
--to=neil@brown.name \
--cc=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 \
--subject='Re: [PATCH 08/23] md: simplify md_setup_drive' \
/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
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).