[PATCH] Undo broken FH conversion that broke nfsroot compile

That conversion to nfs_fh_copy() is bogus since we're not copying into
an nfs_fh anyway. Just revert it.

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index fe679026da7dbf4d7b9f5c8725a1e2d332ae48e5..86461591686259894e7e38cd1ff8f8b2e054c69e 100644 (file)
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -495,8 +495,10 @@ static int __init root_nfs_get_handle(void)
        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;
 }