Subject: [PATCH 2.6] make nfsroot compile

From: Peter Buckingham <[email-masked]>
Date: Thu, 09 Sep 2004 13:53:57 -0700

Hi Ralf,

I needed to merge this fix in from Linus's tree to make things work with 
a NFS root. Now I can boot up broadcom's 1250 :-D

peter

Signed-off-by: Peter Buckingham <[email-masked]>
Index: fs/nfs/nfsroot.c
===================================================================
RCS file: /home/cvs/linux/fs/nfs/nfsroot.c,v
retrieving revision 1.30
diff -u -r1.30 nfsroot.c
--- fs/nfs/nfsroot.c	24 Aug 2004 15:10:14 -0000	1.30
+++ fs/nfs/nfsroot.c	9 Sep 2004 20:53:56 -0000
@@ -495,8 +495,10 @@
 	if (status < 0)
 		printk(KERN_ERR "Root-NFS: Server returned error %d "
 				"while mounting %s\n", status, nfs_path);
-	else
-		nfs_copy_fh(nfs_data.root, fh);
+	else {
+		nfs_data.root.size=fh.size;
+		memcpy(nfs_data.root.data, fh.data, fh.size);
+	}
 
 	return status;
 }