diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:05 -0400 |
commit | bdaf8529385d5126ef791e8f1914afff8cd59bcf (patch) | |
tree | aa9e917703526ad034a19cf1b16002aba486cd17 /init/do_mounts_md.c | |
parent | a29641883f57f36424e3219ae9ff48dd6cd34de0 (diff) |
[PATCH] devfs: Remove devfs from the init code
This patch removes the devfs code from the init/ directory.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init/do_mounts_md.c')
-rw-r--r-- | init/do_mounts_md.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c index f6f36806f84a..2429e1bf8c60 100644 --- a/init/do_mounts_md.c +++ b/init/do_mounts_md.c | |||
@@ -125,19 +125,18 @@ static void __init md_setup_drive(void) | |||
125 | int err = 0; | 125 | int err = 0; |
126 | char *devname; | 126 | char *devname; |
127 | mdu_disk_info_t dinfo; | 127 | mdu_disk_info_t dinfo; |
128 | char name[16], devfs_name[16]; | 128 | char name[16]; |
129 | 129 | ||
130 | minor = md_setup_args[ent].minor; | 130 | minor = md_setup_args[ent].minor; |
131 | partitioned = md_setup_args[ent].partitioned; | 131 | partitioned = md_setup_args[ent].partitioned; |
132 | devname = md_setup_args[ent].device_names; | 132 | devname = md_setup_args[ent].device_names; |
133 | 133 | ||
134 | sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor); | 134 | sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor); |
135 | sprintf(devfs_name, "/dev/md/%s%d", partitioned?"d":"", minor); | ||
136 | if (partitioned) | 135 | if (partitioned) |
137 | dev = MKDEV(mdp_major, minor << MdpMinorShift); | 136 | dev = MKDEV(mdp_major, minor << MdpMinorShift); |
138 | else | 137 | else |
139 | dev = MKDEV(MD_MAJOR, minor); | 138 | dev = MKDEV(MD_MAJOR, minor); |
140 | create_dev(name, dev, devfs_name); | 139 | create_dev(name, dev); |
141 | for (i = 0; i < MD_SB_DISKS && devname != 0; i++) { | 140 | for (i = 0; i < MD_SB_DISKS && devname != 0; i++) { |
142 | char *p; | 141 | char *p; |
143 | char comp_name[64]; | 142 | char comp_name[64]; |
@@ -272,7 +271,7 @@ __setup("md=", md_setup); | |||
272 | 271 | ||
273 | void __init md_run_setup(void) | 272 | void __init md_run_setup(void) |
274 | { | 273 | { |
275 | create_dev("/dev/md0", MKDEV(MD_MAJOR, 0), "md/0"); | 274 | create_dev("/dev/md0", MKDEV(MD_MAJOR, 0)); |
276 | if (raid_noautodetect) | 275 | if (raid_noautodetect) |
277 | printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n"); | 276 | printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n"); |
278 | else { | 277 | else { |