nfsroot compile broken in 2.6.9-rc1?

nfsroot compile broken in 2.6.9-rc1?

[Ray Lehtiniemi]

hi folks

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


i'm no bitkeeper expert yet, but it seems that this change:

   ChangeSet 1.1803.109.17 2004/08/23 18:16:26 trond.myklebust@fys.uio.no

may not be complete...

this patch compiles and boots for me...

===== fs/nfs/nfsroot.c 1.20 vs edited =====
--- 1.20/fs/nfs/nfsroot.c	2004-06-08 15:47:11 -06:00
+++ edited/fs/nfs/nfsroot.c	2004-08-24 10:26:29 -06:00
@@ -496,7 +496,7 @@
 		printk(KERN_ERR "Root-NFS: Server returned error %d "
 				"while mounting %s\n", status, nfs_path);
 	else
-		nfs_copy_fh(nfs_data.root, fh);
+		nfs_copy_fh((struct nfs_fh *)&nfs_data.root, (struct nfs_fh *)&fh);
 
 	return status;
 }



please cc me on replies, as i'm not subscribed.

thanks

-- 
----------------------------------------------------------------------
     Ray L   <rayl@mail.com>

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;
 }

RE: nfsroot compile broken in 2.6.9-rc1?

[Lever, Charles]

ACK.  i think that one was controversial anyway.  go ahead and revert it for now.

> -----Original Message-----
> From: Trond Myklebust [mailto:trond.myklebust@fys.uio.no] 
> Sent: Tuesday, August 24, 2004 1:28 PM
> To: Ray Lehtiniemi; Linus Torvalds; Lever, Charles
> Cc: linux-kernel@vger.kernel.org
> Subject: Re: nfsroot compile broken in 2.6.9-rc1?
> 
> 
> 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;
>  }
> 
>