1 From: Ben Hutchings <ben@decadent.org.uk>
2 Subject: [PATCH] mount.nfs.man, nfs.man: Update distinction between fstypes
4 This addresses Debian bug #575503.
6 --- nfs-utils.orig/utils/mount/mount.nfs.man
7 +++ nfs-utils/utils/mount/mount.nfs.man
10 command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
13 -is used for mounting NFSv4 file system, while
15 -is used to mount NFS file systems versions 3 or 2.
17 is a server share usually in the form of
18 .BR servername:/path/to/share.
20 is the directory on which the file system is to be mounted.
22 +Under Linux 2.6.32 and later kernel versions,
24 +can mount all NFS file system versions. Under earlier Linux kernel versions,
26 +must be used for mounting NFSv4 file systems while
28 +must be used for NFSv3 and v2.
33 --- nfs-utils.orig/utils/mount/nfs.man
34 +++ nfs-utils/utils/mount/nfs.man
39 -field contains either "nfs" (for version 2 or version 3 NFS mounts)
40 -or "nfs4" (for NFS version 4 mounts).
45 -file system types share similar mount options,
46 -which are described below.
47 +field usually contains "nfs". For NFSv4 file systems on Linux
48 +kernel versions before 2.6.32, it must contain "nfs4" (this is
49 +also supported on later versions).
57 -.SS "Valid options for either the nfs or nfs4 file system type"
58 -These options are valid to use when mounting either
63 +.SS "Valid options for all NFS file system versions"
64 They imply the same behavior
65 -and have the same default for both file system types.
66 +and have the same default for all file system versions.
69 +The NFS protocol version number used to contact the server's NFS service.
70 +If the server does not support the requested version,
71 +the mount request fails.
72 +If this option is not specified, the client attempts to use the latest
73 +version (4 or 3), but negotiates the NFS version with the server if this
77 +This option is an alternative to the
80 +It is included for compatibility with other operating systems.
83 Determines the recovery behavior of the NFS client
86 The DATA AND METADATA COHERENCE section contains a
87 detailed discussion of these trade-offs.
88 -.SS "Valid options for the nfs file system type"
89 -Use these options, along with the options in the above subsection,
93 +.SS "Valid options for NFSv2 and v3 file systems"
96 The transport protocol name and protocol family the NFS client uses
98 reports the proper maximum component length to applications
102 -The NFS protocol version number used to contact the server's NFS service.
103 -The Linux client supports version 2 and version 3 of the NFS protocol
104 -when using the file system type
106 -If the server does not support the requested version,
107 -the mount request fails.
108 -If this option is not specified, the client attempts to use version 3,
109 -but negotiates the NFS version with the server if version 3 support
113 -This option is an alternative to the
116 -It is included for compatibility with other operating systems.
118 .BR lock " / " nolock
119 Selects whether to use the NLM sideband protocol to lock files on the server.
120 If neither option is specified (or if
122 on NFS version 3 mounts to read small directories.
123 Some applications perform better if the client uses only READDIR requests
125 -.SS "Valid options for the nfs4 file system type"
126 -Use these options, along with the options in the first subsection above,
130 +.SS "Valid options for NFSv4 file systems"
133 The transport protocol name and protocol family the NFS client uses
134 @@ -851,12 +830,11 @@
135 To mount using NFS version 4,
141 -mount option is not supported for the
144 +file system type or (from Linux 2.6.32) use the
146 +file system type and specify the
150 The following example from an