[PATCH] 2.6.9-rc1 compile fix: nfsroot.c

[PATCH] 2.6.9-rc1 compile fix: nfsroot.c

[Russell King]

Here's an untested patch for this error:

fs/nfs/nfsroot.c: In function `root_nfs_get_handle':
fs/nfs/nfsroot.c:499: error: incompatible type for argument 1 of `nfs_copy_fh'
fs/nfs/nfsroot.c:499: error: incompatible type for argument 2 of `nfs_copy_fh'

diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/fs/nfs/nfsroot.c linux/fs/nfs/nfsroot.c
--- orig/fs/nfs/nfsroot.c	Tue Aug 24 09:56:32 2004
+++ linux/fs/nfs/nfsroot.c	Tue Aug 24 11:11:01 2004
@@ -496,7 +496,7 @@ static int __init root_nfs_get_handle(vo
 		printk(KERN_ERR "Root-NFS: Server returned error %d "
 				"while mounting %s\n", status, nfs_path);
 	else
-		nfs_copy_fh(nfs_data.root, fh);
+		nfs_copy_fh(&nfs_data.root, &fh);
 
 	return status;
 }

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core

Re: [PATCH] 2.6.9-rc1 compile fix: nfsroot.c

[Kevin P. Fleming]

Russell King wrote:

> Here's an untested patch for this error:
> 
> fs/nfs/nfsroot.c: In function `root_nfs_get_handle':
> fs/nfs/nfsroot.c:499: error: incompatible type for argument 1 of `nfs_copy_fh'
> fs/nfs/nfsroot.c:499: error: incompatible type for argument 2 of `nfs_copy_fh'

Compiled and boot-tested here successfully.