From 6f8df09c7dce7415eea7ee2ac43a5d8123ea0460 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 23 Aug 2004 22:28:55 -0700 Subject: [PATCH] [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. --- fs/nfs/nfsroot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index fe679026da7db..8646159168625 100644 --- 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; } -- 2.53.0