Re: Software RAID partitions not detected at boot time with linux 2.6.25.1.

Em Segunda 05 Maio 2008 09:29, Kay Sievers escreveu:
Care to test/fix/improve the following. I just booted a normal disk,
didn't test a partitioned md device.

It works!:

md: Autodetecting RAID arrays.
md: Scanned 3 and added 3 devices.
md: autorun ...
md: considering sdc2 ...
md: adding sdc2 ...
md: adding sdb2 ...
md: adding sda2 ...
md: created md_d0
md: bind<sda2>
md: bind<sdb2>
md: bind<sdc2>
md: running: <sdc2><sdb2><sda2>
raid5: device sdc2 operational as raid disk 2
raid5: device sdb2 operational as raid disk 1
raid5: device sda2 operational as raid disk 0
raid5: allocated 3224kB for md_d0
raid5: raid level 5 set md_d0 active with 3 out of 3 devices, algorithm 2
RAID5 conf printout:
--- rd:3 wd:3
disk 0, o:1, dev:sda2
disk 1, o:1, dev:sdb2
disk 2, o:1, dev:sdc2
md: ... autorun DONE.
md_d0: p1 p2 p3 p4 < p5 p6 p7 >

I will test it in another machine with raid1 later. If something
goes wrong there, I will report.

Thanks,
Kay

Thank you,
João Luis.


From: Kay Sievers <kay.sievers@xxxxxxxx>
Subject: block: do_mounts - accept root=<non-existant partition>

Some devices, like md, may create partitions only at first access,
so allow root= to be set to a valid non-existant partition of an
existing disk. This applies only to non-initramfs root mounting.

Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
---

diff --git a/block/genhd.c b/block/genhd.c
index fda9c7a..129ad93 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -653,7 +653,7 @@ void genhd_media_change_notify(struct gendisk *disk)
EXPORT_SYMBOL_GPL(genhd_media_change_notify);
#endif /* 0 */

-dev_t blk_lookup_devt(const char *name)
+dev_t blk_lookup_devt(const char *name, int part)
{
struct device *dev;
dev_t devt = MKDEV(0, 0);
@@ -661,7 +661,11 @@ dev_t blk_lookup_devt(const char *name)
mutex_lock(&block_class_lock);
list_for_each_entry(dev, &block_class.devices, node) {
if (strcmp(dev->bus_id, name) == 0) {
- devt = dev->devt;
+ struct gendisk *disk = dev_to_disk(dev);
+
+ if (part < disk->minors)
+ devt = MKDEV(MAJOR(dev->devt),
+ MINOR(dev->devt) + part);
break;
}
}
@@ -669,7 +673,6 @@ dev_t blk_lookup_devt(const char *name)

return devt;
}
-
EXPORT_SYMBOL(blk_lookup_devt);

struct gendisk *alloc_disk(int minors)
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index ecd2bf6..612a790 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -524,7 +524,7 @@ struct unixware_disklabel {
#define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2

-extern dev_t blk_lookup_devt(const char *name);
+extern dev_t blk_lookup_devt(const char *name, int part);
extern char *disk_name (struct gendisk *hd, int part, char *buf);

extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
@@ -552,7 +552,7 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index)

static inline void printk_all_partitions(void) { }

-static inline dev_t blk_lookup_devt(const char *name)
+static inline dev_t blk_lookup_devt(const char *name, int part)
{
dev_t devt = MKDEV(0, 0);
return devt;
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3885e70..660c1e5 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -76,6 +76,7 @@ dev_t name_to_dev_t(char *name)
char s[32];
char *p;
dev_t res = 0;
+ int part;

if (strncmp(name, "/dev/", 5) != 0) {
unsigned maj, min;
@@ -106,7 +107,31 @@ dev_t name_to_dev_t(char *name)
for (p = s; *p; p++)
if (*p == '/')
*p = '!';
- res = blk_lookup_devt(s);
+ res = blk_lookup_devt(s, 0);
+ if (res)
+ goto done;
+
+ /*
+ * try non-existant, but valid partition, which may only exist
+ * after revalidating the disk, like partitioned md devices
+ */
+ while (p > s && isdigit(p[-1]))
+ p--;
+ if (p == s || !*p || *p == '0')
+ goto fail;
+
+ /* try disk name without <part number> */
+ part = simple_strtoul(p, NULL, 10);
+ *p = '\0';
+ res = blk_lookup_devt(s, part);
+ if (res)
+ goto done;
+
+ /* try disk name without p<part number> */
+ if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')
+ goto fail;
+ p[-1] = '\0';
+ res = blk_lookup_devt(s, part);
if (res)
goto done;




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • slackware 9.1 software raid problem
    ... Setting up a RAID system with Slackware 8 is not extremely difficult once ... mirroring the root partition and booting from that mirror was not possible. ... Each disk is attached to a different IDE chain on the motherboard. ... The ability to boot from the Slackware 8 install CD. ...
    (alt.os.linux)
  • Re: Un-RAID on ICH8R?
    ... These are the supported migrations in Intel Matrix RAID. ... Would adding an extra disk and making it a recovery partition help? ...
    (alt.comp.hardware.pc-homebuilt)
  • Help! Repairing a RAID 1 dynamic disk
    ... Its a Dell Windows 2000 server with two SCSI hard drives running ... The two drives are configured with dynamic disk and software RAID ... The disk 0's C:OS partition is no longer synced to the disk 1's ...
    (microsoft.public.windows.server.sbs)
  • Re: Help! Repairing a RAID 1 dynamic disk
    ... Its a Dell Windows 2000 server with two SCSI hard drives running ... The two drives are configured with dynamic disk and software RAID ... The disk 0's C:OS partition is no longer synced to the disk 1's ...
    (microsoft.public.windows.server.sbs)
  • Help! Repairing a RAID 1 dynamic disk
    ... Its a Dell Windows 2000 server with two SCSI hard drives running ... The two drives are configured with dynamic disk and software RAID ... The disk 0's C:OS partition is no longer synced to the disk 1's ...
    (microsoft.public.windows.server.general)
Loading