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

From: Russell King
Date: Tue Aug 24 2004 - 05:19:52 EST


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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/