public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fix NFS root in 2.4.12
@ 2001-10-16  2:01 Tim Hockin
  2001-10-16  2:09 ` Alexander Viro
  2001-10-16  5:21 ` Keith Owens
  0 siblings, 2 replies; 4+ messages in thread
From: Tim Hockin @ 2001-10-16  2:01 UTC (permalink / raw)
  To: Linux Kernel Mailing List, alan, torvalds

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

Linus, Alan,

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

Thanks

Tim
-- 
Tim Hockin
Systems Software Engineer
Sun Microsystems, Cobalt Server Appliances
thockin@sun.com

[-- Attachment #2: nfsroot.diff --]
[-- Type: text/plain, Size: 530 bytes --]

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;

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

* Re: [PATCH] fix NFS root in 2.4.12
  2001-10-16  2:01 [PATCH] fix NFS root in 2.4.12 Tim Hockin
@ 2001-10-16  2:09 ` Alexander Viro
  2001-10-16  2:24   ` Tim Hockin
  2001-10-16  5:21 ` Keith Owens
  1 sibling, 1 reply; 4+ messages in thread
From: Alexander Viro @ 2001-10-16  2:09 UTC (permalink / raw)
  To: Tim Hockin; +Cc: Linux Kernel Mailing List, alan, torvalds



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?


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

* Re: [PATCH] fix NFS root in 2.4.12
  2001-10-16  2:09 ` Alexander Viro
@ 2001-10-16  2:24   ` Tim Hockin
  0 siblings, 0 replies; 4+ messages in thread
From: Tim Hockin @ 2001-10-16  2:24 UTC (permalink / raw)
  To: Alexander Viro; +Cc: Linux Kernel Mailing List, alan, torvalds

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
thockin@sun.com

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

* Re: [PATCH] fix NFS root in 2.4.12
  2001-10-16  2:01 [PATCH] fix NFS root in 2.4.12 Tim Hockin
  2001-10-16  2:09 ` Alexander Viro
@ 2001-10-16  5:21 ` Keith Owens
  1 sibling, 0 replies; 4+ messages in thread
From: Keith Owens @ 2001-10-16  5:21 UTC (permalink / raw)
  To: Tim Hockin; +Cc: Linux Kernel Mailing List, alan, torvalds

On Mon, 15 Oct 2001 19:01:08 -0700, 
Tim Hockin <thockin@sun.com> 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.


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

end of thread, other threads:[~2001-10-16  5:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-10-16  2:01 [PATCH] fix NFS root in 2.4.12 Tim Hockin
2001-10-16  2:09 ` Alexander Viro
2001-10-16  2:24   ` Tim Hockin
2001-10-16  5:21 ` Keith Owens

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