Re: nfsroot compile broken in 2.6.9-rc1?

[Trond Myklebust]

På ty , 24/08/2004 klokka 12:50, skreiv Ray Lehtiniemi:
> just pulled the latest changes, and it seems nfsroot no longer
> compiles:
> 
>      CC      fs/nfs/nfsroot.o
>    fs/nfs/nfsroot.c: In function `root_nfs_get_handle':
>    fs/nfs/nfsroot.c:499: error: cannot convert to a pointer type
>    fs/nfs/nfsroot.c:499: error: cannot convert to a pointer type
>    make[2]: *** [fs/nfs/nfsroot.o] Error 1

Chuck, that conversion to nfs_fh_copy() is bogus since we're not copying
into an nfs_fh anyway. Let's just revert it.

Cheers,
  Trond

--- linux-2.6.9-up/fs/nfs/nfsroot.c.orig	2004-08-24 11:18:27.000000000 -0400
+++ linux-2.6.9-up/fs/nfs/nfsroot.c	2004-08-24 13:18:32.000000000 -0400
@@ -495,8 +495,10 @@ static int __init root_nfs_get_handle(vo
 	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;
 }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/