Fix compiler warning about using a wrong type as the argument for

nfsroot_mount().

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 936d341c610a9dff01d407dd2bd57706e02df736..b14a7bf3d6bfc6691259f2b0564fbbd3825aac4f 100644 (file)
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -437,6 +437,7 @@ static int __init root_nfs_ports(void)
  */
 static int __init root_nfs_get_handle(void)
 {
+       struct nfs_fh fh;
        struct sockaddr_in sin;
        int status;
        int protocol = (nfs_data.flags & NFS_MOUNT_TCP) ?
@@ -445,11 +446,14 @@ static int __init root_nfs_get_handle(void)
                                        NFS_MNT3_VERSION : NFS_MNT_VERSION;
 
        set_sockaddr(&sin, servaddr, mount_port);
-       status = nfsroot_mount(&sin, nfs_path, &nfs_data.root,
-                                                       version, protocol);
+       status = nfsroot_mount(&sin, nfs_path, &fh, version, protocol);
        if (status < 0)
                printk(KERN_ERR "Root-NFS: Server returned error %d "
                                "while mounting %s\n", status, nfs_path);
+       else {
+               nfs_data.root.size = fh.size;
+               memcpy(nfs_data.root.data, fh.data, fh.size);
+       }
 
        return status;
 }