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 05/23] md: replace the RAID_AUTORUN ioctl with a direct function call
Date: Thu, 16 Jul 2020 09:33:04 +1000 [thread overview]
Message-ID: <87blkgxsjz.fsf@notabene.neil.brown.name> (raw)
In-Reply-To: <20200714190427.4332-6-hch@lst.de>
[-- Attachment #1: Type: text/plain, Size: 3596 bytes --]
On Tue, Jul 14 2020, Christoph Hellwig wrote:
> Instead of using a spcial RAID_AUTORUN ioctl that only exists for
> non-modular builds and is only called from the early init code, just
> call the actual function directly.
I think there was a tool in the old 'mdutls' that would call this ioctl
from user-space, but I cannot find a copy of that online, so I cannot be
sure.... not that it really matters.
Reviewed-by: NeilBrown <neilb@suse.de>
Thanks,
NeilBrown
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Acked-by: Song Liu <song@kernel.org>
> ---
> drivers/md/md-autodetect.c | 10 ++--------
> drivers/md/md.c | 14 +-------------
> drivers/md/md.h | 3 +++
> 3 files changed, 6 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/md/md-autodetect.c b/drivers/md/md-autodetect.c
> index fe806f7b9759a1..0eb746211ed53c 100644
> --- a/drivers/md/md-autodetect.c
> +++ b/drivers/md/md-autodetect.c
> @@ -9,6 +9,7 @@
> #include <linux/raid/detect.h>
> #include <linux/raid/md_u.h>
> #include <linux/raid/md_p.h>
> +#include "md.h"
>
> /*
> * When md (and any require personalities) are compiled into the kernel
> @@ -285,8 +286,6 @@ __setup("md=", md_setup);
>
> static void __init autodetect_raid(void)
> {
> - int fd;
> -
> /*
> * Since we don't want to detect and use half a raid array, we need to
> * wait for the known devices to complete their probing
> @@ -295,12 +294,7 @@ static void __init autodetect_raid(void)
> printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
>
> wait_for_device_probe();
> -
> - fd = ksys_open("/dev/md0", 0, 0);
> - if (fd >= 0) {
> - ksys_ioctl(fd, RAID_AUTORUN, raid_autopart);
> - ksys_close(fd);
> - }
> + md_autostart_arrays(raid_autopart);
> }
>
> void __init md_run_setup(void)
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index f567f536b529bd..6e9a48da474848 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -68,10 +68,6 @@
> #include "md-bitmap.h"
> #include "md-cluster.h"
>
> -#ifndef MODULE
> -static void autostart_arrays(int part);
> -#endif
> -
> /* pers_list is a list of registered personalities protected
> * by pers_lock.
> * pers_lock does extra service to protect accesses to
> @@ -7421,7 +7417,6 @@ static inline bool md_ioctl_valid(unsigned int cmd)
> case GET_DISK_INFO:
> case HOT_ADD_DISK:
> case HOT_REMOVE_DISK:
> - case RAID_AUTORUN:
> case RAID_VERSION:
> case RESTART_ARRAY_RW:
> case RUN_ARRAY:
> @@ -7467,13 +7462,6 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
> case RAID_VERSION:
> err = get_version(argp);
> goto out;
> -
> -#ifndef MODULE
> - case RAID_AUTORUN:
> - err = 0;
> - autostart_arrays(arg);
> - goto out;
> -#endif
> default:;
> }
>
> @@ -9721,7 +9709,7 @@ void md_autodetect_dev(dev_t dev)
> }
> }
>
> -static void autostart_arrays(int part)
> +void md_autostart_arrays(int part)
> {
> struct md_rdev *rdev;
> struct detected_devices_node *node_detected_dev;
> diff --git a/drivers/md/md.h b/drivers/md/md.h
> index 612814d07d35ab..37315a3f28e97d 100644
> --- a/drivers/md/md.h
> +++ b/drivers/md/md.h
> @@ -800,4 +800,7 @@ static inline void mddev_check_write_zeroes(struct mddev *mddev, struct bio *bio
> !bio->bi_disk->queue->limits.max_write_zeroes_sectors)
> mddev->queue->limits.max_write_zeroes_sectors = 0;
> }
> +
> +void md_autostart_arrays(int part);
> +
> #endif /* _MD_MD_H */
> --
> 2.27.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2020-07-15 23:33 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 [this message]
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
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=87blkgxsjz.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 05/23] md: replace the RAID_AUTORUN ioctl with a direct function call' \
/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).