2001-10-16 02:04:07

by Tim Hockin

[permalink] [raw]
Subject: [PATCH] fix NFS root in 2.4.12

diff -ruN dist-2.4.12+patches/fs/super.c cvs-2.4.12+patches/fs/super.c
--- dist-2.4.12+patches/fs/super.c Mon Oct 15 10:23:02 2001
+++ cvs-2.4.12+patches/fs/super.c Mon Oct 15 10:23:02 2001
@@ -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;

Attachments:
nfsroot.diff (530.00 B)

2001-10-16 02:09:38

by Alexander Viro

[permalink] [raw]
Subject: Re: [PATCH] fix NFS root in 2.4.12



On Mon, 15 Oct 2001, Tim Hockin wrote:

> Linus, Alan,
>
> This one liner fixes NFS root for kernel 2.4.12. Please apply.

>- 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?

2001-10-16 02:27:39

by Tim Hockin

[permalink] [raw]
Subject: Re: [PATCH] fix NFS root in 2.4.12

Alexander Viro wrote:

> 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
--
Tim Hockin
Systems Software Engineer
Sun Microsystems, Cobalt Server Appliances
[email protected]

2001-10-16 05:21:49

by Keith Owens

[permalink] [raw]
Subject: Re: [PATCH] fix NFS root in 2.4.12

On Mon, 15 Oct 2001 19:01:08 -0700,
Tim Hockin <[email protected]> wrote:
>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
>--- dist-2.4.12+patches/fs/super.c Mon Oct 15 10:23:02 2001
>+++ cvs-2.4.12+patches/fs/super.c Mon Oct 15 10:23:02 2001
>@@ -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.