Attachment 306322 Details for Bug 447818 – Patch to Incremental.c to fix.

[patch] Patch to Incremental.c to fix.

mdadm-2.6.4-partitionable.patch (text/plain), 1.36 KB, created by George Joseph on 2008-05-21 22:13:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Joseph

Created: 2008-05-21 22:13:41 UTC

Size: 1.36 KB

patch

obsolete

>diff -ruN mdadm-2.6.4/Incremental.c mdadm-2.6.4-gtj/Incremental.c
>--- mdadm-2.6.4/Incremental.c	2007-10-18 21:59:53.000000000 -0600
>+++ mdadm-2.6.4-gtj/Incremental.c	2008-05-21 15:35:57.000000000 -0600
>@@ -88,9 +88,6 @@
> 
> 	struct createinfo *ci = conf_get_create_info();
> 
>-	if (autof == 0)
>-		autof = ci->autof;
>-
> 	/* 1/ Check if devices is permitted by mdadm.conf */
> 
> 	if (!conf_test_dev(devname)) {
>@@ -214,6 +211,14 @@
> 			return 2;
> 		}
> 	}
>+	
>+	if (autof == 0)
>+		autof = match->autof;
>+	int use_partitions = 1;
>+	if ((autof&7) == 3 || (autof&7) == 5)
>+		use_partitions = 0;
>+	int parts = autof>>3;
>+	
> 	/* 4/ Determine device number. */
> 	/* - If in mdadm.conf with std name, use that */
> 	/* - UUID in /var/run/mdadm.map  use that */
>@@ -222,7 +227,7 @@
> 	/* - Choose a free, high number. */
> 	/* - Use a partitioned device unless strong suggestion not to. */
> 	/*         e.g. auto=md */
>-	if (match && is_standard(match->devname, &devnum))
>+	if (match && is_standard(match->devname, &devnum) && !use_partitions)
> 		/* We have devnum now */;
> 	else if ((mp = map_by_uuid(&map, info.uuid)) != NULL)
> 		devnum = mp->devnum;
>@@ -271,6 +276,11 @@
> 			chosen_name, strerror(errno));
> 		return 2;
> 	}
>+	
>+	if (use_partitions) {
>+		make_parts(match->devname, parts, ci->symlinks);
>+	}
>+	
> 	/* 5/ Find out if array already exists */
> 	if (! mddev_busy(devnum)) {
> 	/* 5a/ if it does not */

Actions: View | Diff

Attachments on bug 447818: 306322 | 324722