lkml.org 
[lkml]   [2003]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectNFS root fix for 2.4.22-pre9 for inclusion ...

Hi Marcelo!

here is the updated version of the NFS root fix, which
corrects the following faulty behaviour (final reprise ?):

> root_dev_setup() is called with "root=xy" and, in turn calls
> name_to_kdev_t() which searches root_dev_names[] for the given
> device name, which if not found results in (0:0) this is
> handled by the current code like root=/dev/nfs, which IMHO is
> the wrong behaviour ...

please include in 2.4.22-pre10 ...

TIA,
Herbert

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;
\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.053 / U:8.972 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site