Commit 6f8df09c authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds

[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.
parent 89f593ca
...@@ -495,8 +495,10 @@ static int __init root_nfs_get_handle(void) ...@@ -495,8 +495,10 @@ static int __init root_nfs_get_handle(void)
if (status < 0) if (status < 0)
printk(KERN_ERR "Root-NFS: Server returned error %d " printk(KERN_ERR "Root-NFS: Server returned error %d "
"while mounting %s\n", status, nfs_path); "while mounting %s\n", status, nfs_path);
else else {
nfs_copy_fh(nfs_data.root, fh); nfs_data.root.size = fh.size;
memcpy(nfs_data.root.data, fh.data, fh.size);
}
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment