fix NFS root in 2.4.12

PATCH In review Tim Hockin 3 participants 4 messages Oct 16, 2001 VFS

lore

Share & tools

lore

Tim Hockin

author

2001-10-16 02:04 UTC #0 lore raw

PATCH 1/1 fix NFS root in 2.4.12

Linus, Alan,

This one liner fixes NFS root for kernel 2.4.12. Please apply.

Thanks

Tim

Signature · 4 lines

Tim Hockin
Systems Software Engineer
Sun Microsystems, Cobalt Server Appliances
[email protected]

fs/super.c +1 -1

diff -ruN dist-2.4.12+patches/fs/super.c cvs-2.4.12+patches/fs/super.c
@@ -935,7 +935,7 @@
 	data = nfs_root_data();
 	if (!data)
 		goto no_nfs;
-	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", data);
+	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", NULL, data);
 	if (!IS_ERR(vfsmnt)) {
 		printk ("VFS: Mounted root (%s filesystem).\n", "nfs");
 		ROOT_DEV = vfsmnt->mnt_sb->s_dev;

Alexander Viro

2001-10-16 02:09 UTC #1 lore raw

fs/super.c line 938

Quoted 6 lines · Tim Hockin

Linus, Alan,
This one liner fixes NFS root for kernel 2.4.12. Please apply.
fs/super.c +1 -1
-	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", data);
+	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", NULL, data);

Had you actually tried to compile that? do_kern_mount() is defined as

struct vfsmount *do_kern_mount(char *type, int flags, char *name, void *data)

Where did you find 5th argument?

Tim Hockin

author

2001-10-16 02:27 UTC #2 lore raw

Quoted 5 lines · Alexander Viro

Had you actually tried to compile that? do_kern_mount() is defined as
struct vfsmount *do_kern_mount(char *type, int flags, char *name, void *data)
Where did you find 5th argument?

DOH! In the XFS patch, apparently :) This should have been sent to the XFS people, if at all.

My bad.

Tim

Signature · 4 lines

Tim Hockin
Systems Software Engineer
Sun Microsystems, Cobalt Server Appliances
[email protected]

Keith Owens

2001-10-16 05:21 UTC #3 lore raw

In reply to Tim Hockin

fs/super.c line 941

Quoted 13 lines · Tim Hockin

This one liner fixes NFS root for kernel 2.4.12. Please apply. diff -ruN dist-2.4.12+patches/fs/super.c cvs-2.4.12+patches/fs/super.c

fs/super.c +1 -1

@@ -935,7 +935,7 @@
 	data = nfs_root_data();
 	if (!data)
 		goto no_nfs;
-	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", data);
+	vfsmnt = do_kern_mount("nfs", root_mountflags, "/dev/root", NULL, data);
 	if (!IS_ERR(vfsmnt)) {
 		printk ("VFS: Mounted root (%s filesystem).\n", "nfs");
 		ROOT_DEV = vfsmnt->mnt_sb->s_dev;

XFS only. Fixed in XFS CVS tree now.