patch-2.1.32 linux/include/linux/nfs_mount.h

Next file: linux/include/linux/nfsd/auth.h
Previous file: linux/include/linux/nfs_fs_sb.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.31/linux/include/linux/nfs_mount.h linux/include/linux/nfs_mount.h
@@ -16,36 +16,25 @@
  * mount-to-kernel version compatibility.  Some of these aren't used yet
  * but here they are anyway.
  */
-
-#define NFS_NFS_PROGRAM		100003	/* nfsd program number */
-#define NFS_NFS_VERSION		2	/* nfsd version */
-#define NFS_NFS_PORT		2049	/* portnumber on server for nfsd */
-
-#define NFS_MOUNT_PROGRAM	100005	/* mountd program number */
-#define NFS_MOUNT_VERSION	1	/* mountd version */
-#define NFS_MOUNT_PROC		1	/* mount process id */
-#define NFS_MOUNT_PORT		627	/* portnumber on server for mountd */
-
-#define NFS_PMAP_PROGRAM	100000	/* portmap program number */
-#define NFS_PMAP_VERSION	2	/* portmap version */
-#define NFS_PMAP_PROC		3	/* portmap getport id */
-#define NFS_PMAP_PORT		111	/* portnumber on server for portmap */
+#define NFS_MOUNT_VERSION	3
 
 struct nfs_mount_data {
-	int version;			/* 1 */
-	int fd;				/* 1 */
-	struct nfs_fh root;		/* 1 */
-	int flags;			/* 1 */
-	int rsize;			/* 1 */
-	int wsize;			/* 1 */
-	int timeo;			/* 1 */
-	int retrans;			/* 1 */
-	int acregmin;			/* 1 */
-	int acregmax;			/* 1 */
-	int acdirmin;			/* 1 */
-	int acdirmax;			/* 1 */
-	struct sockaddr_in addr;	/* 1 */
-	char hostname[256];		/* 1 */
+	int		version;		/* 1 */
+	int		fd;			/* 1 */
+	struct nfs_fh	root;			/* 1 */
+	int		flags;			/* 1 */
+	int		rsize;			/* 1 */
+	int		wsize;			/* 1 */
+	int		timeo;			/* 1 */
+	int		retrans;		/* 1 */
+	int		acregmin;		/* 1 */
+	int		acregmax;		/* 1 */
+	int		acdirmin;		/* 1 */
+	int		acdirmax;		/* 1 */
+	struct sockaddr_in addr;		/* 1 */
+	char		hostname[256];		/* 1 */
+	int		namlen;			/* 2 */
+	unsigned int	bsize;			/* 3 */
 };
 
 /* bits in the flags field */
@@ -56,5 +45,9 @@
 #define NFS_MOUNT_POSIX		0x0008	/* 1 */
 #define NFS_MOUNT_NOCTO		0x0010	/* 1 */
 #define NFS_MOUNT_NOAC		0x0020	/* 1 */
+#define NFS_MOUNT_TCP		0x0040	/* 2 */
+#define NFS_MOUNT_VER3		0x0080	/* 3 */
+#define NFS_MOUNT_KERBEROS	0x0100	/* 3 */
+#define NFS_MOUNT_NONLM		0x0200	/* 3 */
  
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov