[LV-k25-commit] CVS: kernel-2.5/fs/nfs inode.c,1.1.1.23,1.2 proc.c,1.1.1.8,1.2

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/nfs
In directory sc8-pr-cvs1:/tmp/cvs-serv7317/fs/nfs

Modified Files:
	inode.c proc.c 
Log Message:
Two NFS fixes that will appear in 2.5.44.  Needed now to prevent 
a crash during boot with NFS-root.


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/inode.c,v
retrieving revision 1.1.1.23
retrieving revision 1.2
diff -u -r1.1.1.23 -r1.2
--- inode.c	24 Mar 2003 21:32:42 -0000	1.1.1.23
+++ inode.c	24 Mar 2003 23:48:49 -0000	1.2
@@ -1355,7 +1355,7 @@
 	if (data->auth_flavourlen != 0) {
 		if (data->auth_flavourlen > 1)
 			printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
-		if (copy_from_user(authflavour, data->auth_flavours, sizeof(authflavour))) {
+		if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
 			err = -EFAULT;
 			goto out_fail;
 		}

Index: proc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/proc.c,v
retrieving revision 1.1.1.8
retrieving revision 1.2
diff -u -r1.1.1.8 -r1.2
--- proc.c	24 Mar 2003 21:32:43 -0000	1.1.1.8
+++ proc.c	24 Mar 2003 23:48:49 -0000	1.2
@@ -490,7 +490,7 @@
 
 	dprintk("NFS call  fsinfo\n");
 	info->fattr->valid = 0;
-	status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &info, 0);
+	status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &fsinfo, 0);
 	dprintk("NFS reply fsinfo: %d\n", status);
 	if (status)
 		goto out;