mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* ROOT NFS fixes ...
@ 2003-07-29 21:15 Herbert Pötzl
  2003-07-30 13:57 ` Marcelo Tosatti
  0 siblings, 1 reply; 8+ messages in thread
From: Herbert Pötzl @ 2003-07-29 21:15 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Trond Myklebust, linux-kernel


Hi Marcelo!

just verified that the NFS root bug-fix was not
included in 2.4.22-pre9, unfortunately I have 
to ask you again, why you do not want to fix 
this issue in 2.4.22 ...

I do not understand why Trond obviously is
ignoring my mails, regarding this particular
issue, maybe he is just too busy to look at 
four twoline changes, and more, I do not 
understand why this isn't accepted into the 
marcelo kernel tree, as it obviously fixes a
misbehaviour?

please explain!

It is okay for me, if your argumentation goes 
like "I don't like you, that's reason enough
for me to not include your patches ...", but I
would like to know ...

best,
Herbert



^ permalink raw reply	[flat|nested] 8+ messages in thread
* ROOT NFS fixes ...
@ 2003-07-22 14:38 Herbert Pötzl
  0 siblings, 0 replies; 8+ messages in thread
From: Herbert Pötzl @ 2003-07-22 14:38 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: Marcelo Tosatti, lkml


Hi Trond!

please have a look at the attached patch, which
addresses the root=/dev/wossname issue, when ROOT_NFS
is configured. this is a NFS only issue, and IMHO
fixes an erroneous behaviour.

if it seems okay to you, please let Marcelo know,
so he could add this patch to the next -pre kernel

MTIA,
Herbert


------------- NFS ROOT FIX

diff -NurbP --minimal linux-2.4.22-pre7/fs/nfs/nfsroot.c linux-2.4.22-pre7-fix/fs/nfs/nfsroot.c
--- linux-2.4.22-pre7/fs/nfs/nfsroot.c	2003-06-13 16:51:37.000000000 +0200
+++ linux-2.4.22-pre7-fix/fs/nfs/nfsroot.c	2003-07-21 22:15:12.000000000 +0200
@@ -305,7 +305,7 @@
  */
 int __init nfs_root_setup(char *line)
 {
-	ROOT_DEV = MKDEV(UNNAMED_MAJOR, 255);
+	ROOT_DEV = MKDEV(NFS_MAJOR, NFS_MINOR);
 	if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {
 		strncpy(nfs_root_name, line, sizeof(nfs_root_name));
 		nfs_root_name[sizeof(nfs_root_name)-1] = '\0';
diff -NurbP --minimal linux-2.4.22-pre7/include/linux/nfs.h linux-2.4.22-pre7-fix/include/linux/nfs.h
--- linux-2.4.22-pre7/include/linux/nfs.h	2000-04-01 18:04:27.000000000 +0200
+++ linux-2.4.22-pre7-fix/include/linux/nfs.h	2003-07-21 22:13:12.000000000 +0200
@@ -30,6 +30,9 @@
 #define NFS_MNT_PROGRAM	100005
 #define NFS_MNT_PORT	627
 
+#define NFS_MAJOR   	UNNAMED_MAJOR
+#define NFS_MINOR   	0xff
+
 /*
  * NFS stats. The good thing with these values is that NFSv3 errors are
  * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
diff -NurbP --minimal linux-2.4.22-pre7/init/do_mounts.c linux-2.4.22-pre7-fix/init/do_mounts.c
--- linux-2.4.22-pre7/init/do_mounts.c	2003-07-19 14:14:31.000000000 +0200
+++ linux-2.4.22-pre7-fix/init/do_mounts.c	2003-07-21 22:13:12.000000000 +0200
@@ -88,7 +88,7 @@
 	const char *name;
 	const int num;
 } root_dev_names[] __initdata = {
-	{ "nfs",     0x00ff },
+	{ "nfs",     MKDEV(NFS_MAJOR, NFS_MINOR) },
 	{ "hda",     0x0300 },
 	{ "hdb",     0x0340 },
 	{ "loop",    0x0700 },
@@ -759,7 +759,8 @@
 static void __init mount_root(void)
 {
 #ifdef CONFIG_ROOT_NFS
-	if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) {
+       if (MAJOR(ROOT_DEV) == NFS_MAJOR
+           && MINOR(ROOT_DEV) == NFS_MINOR) {
 		if (mount_nfs_root()) {
 			sys_chdir("/root");
 			ROOT_DEV = current->fs->pwdmnt->mnt_sb->s_dev;
diff -NurbP --minimal linux-2.4.22-pre7/net/ipv4/ipconfig.c linux-2.4.22-pre7-fix/net/ipv4/ipconfig.c
--- linux-2.4.22-pre7/net/ipv4/ipconfig.c	2003-07-19 14:14:31.000000000 +0200
+++ linux-2.4.22-pre7-fix/net/ipv4/ipconfig.c	2003-07-21 22:15:50.000000000 +0200
@@ -1234,7 +1234,7 @@
 			 * 				-- Chip
 			 */
 #ifdef CONFIG_ROOT_NFS
-			if (ROOT_DEV == MKDEV(UNNAMED_MAJOR, 255)) {
+			if (ROOT_DEV == MKDEV(NFS_MAJOR, NFS_MINOR)) {
 				printk(KERN_ERR 
 					"IP-Config: Retrying forever (NFS root)...\n");
 				goto try_try_again;



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2003-07-30 15:57 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-29 21:15 ROOT NFS fixes Herbert Pötzl
2003-07-30 13:57 ` Marcelo Tosatti
     [not found]   ` <20030730140739.GA24587@www.13thfloor.at>
2003-07-30 14:08     ` Marcelo Tosatti
2003-07-30 14:28       ` Marcelo Tosatti
2003-07-30 15:07         ` Herbert Pötzl
2003-07-30 15:53           ` Marcelo Tosatti
2003-07-30 14:20   ` Marc-Christian Petersen
  -- strict thread matches above, loose matches on Subject: below --
2003-07-22 14:38 Herbert Pötzl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®