patch-2.4.20 linux-2.4.20/fs/nfs/nfsroot.c

• Lines: 28
• Date: Thu Nov 28 15:53:15 2002
• Orig file: linux-2.4.19/fs/nfs/nfsroot.c
• Orig date: Fri Aug 2 17:39:45 2002

diff -urN linux-2.4.19/fs/nfs/nfsroot.c linux-2.4.20/fs/nfs/nfsroot.c
@@ -64,6 +64,8 @@
  *	Trond Myklebust :	Add in preliminary support for NFSv3 and TCP.
  *				Fix bug in root_nfs_addr(). nfs_data.namlen
  *				is NOT for the length of the hostname.
+ *	Hua Qin		:	Finish support for mounting root file system
+ *				via NFS over TCP.
  */
 
 #include <linux/config.h>
@@ -407,12 +409,14 @@
 {
 	struct sockaddr_in sin;
 	int status;
+	int protocol = (nfs_data.flags & NFS_MOUNT_TCP) ?
+					IPPROTO_TCP : IPPROTO_UDP;
+	int version = (nfs_data.flags & NFS_MOUNT_VER3) ?
+					NFS_MNT3_VERSION : NFS_MNT_VERSION;
 
 	set_sockaddr(&sin, servaddr, mount_port);
-	if (nfs_data.flags & NFS_MOUNT_VER3)
-		status = nfs3_mount(&sin, nfs_path, &nfs_data.root);
-	else
-		status = nfs_mount(&sin, nfs_path, &nfs_data.root);
+	status = nfsroot_mount(&sin, nfs_path, &nfs_data.root,
+							version, protocol);
 	if (status < 0)
 		printk(KERN_ERR "Root-NFS: Server returned error %d "
 				"while mounting %s\n", status, nfs_path);