[PATCH 2.6.0-test1-mm2] fix unable to mount root fs

[Daniel McNeil <daniel@osdl.org>]

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

The problem is being caused by the dev_t changes that now print out
dev_t's as major:minor instead of a hex value.  See print_dev_t().

This patch changes try_name() in init/do_mounts.c to get the major
and minor and return a MKDEV(major, minor).  I've tested this on
my machines and it boots with root=/dev/hda2.

Daniel McNeil <daniel@osdl.org>
On Sun, 2003-07-20 at 03:55, Florian Huber wrote:
> Hello ML,
> I can't boot my 2.6.0-test1-mm2 kernel (+GCC 3.3). The kernel panics
> at bootime:
> 
> VFS: Cannot open root device "hda3" or unknow-block(0,0)
> Please append a correct "root=" boot option
> Kernel Panic: VFS: Unable to mount root fs on unknown-block(0,0)
> 
> I do have compiled support for the file system on my root partition
> (xfs). The same configuration worked well with 2.6.0-test1-mm1.
> 
> Perhaps somebody knows how to solve this.
> 
> TIA
> 	Florian Huber
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


[-- Attachment #2: patch.2.6.0-test1-mm2.do_mounts --]
[-- Type: text/x-patch, Size: 922 bytes --]

diff -rupN -X /home/daniel_nfs/dontdiff linux-2.6.0-test1-mm2/init/do_mounts.c linux-2.6.0-test1-mm2.do_mounts/init/do_mounts.c
--- linux-2.6.0-test1-mm2/init/do_mounts.c	2003-07-23 11:19:32.018914859 -0700
+++ linux-2.6.0-test1-mm2.do_mounts/init/do_mounts.c	2003-07-23 11:25:19.356002570 -0700
@@ -58,6 +58,7 @@ static dev_t __init try_name(char *name,
 	char *s;
 	int len;
 	int fd;
+	unsigned int maj, min;
 
 	/* read device number from .../dev */
 
@@ -70,8 +71,12 @@ static dev_t __init try_name(char *name,
 	if (len <= 0 || len == 32 || buf[len - 1] != '\n')
 		goto fail;
 	buf[len - 1] = '\0';
-	res = (dev_t) simple_strtoul(buf, &s, 16);
-	if (*s)
+	/*
+	 * The format of dev is now %u:%u -- see print_dev_t()
+	 */
+	if (sscanf(buf, "%u:%u", &maj, &min) == 2)
+		res = MKDEV(maj, min);
+	else
 		goto fail;
 
 	/* if it's there and we are not looking for a partition - that's it */