2008-09-24 18:29:03

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH] nfs(5): Replace the term "netid" in mount option descriptions

TI-RPC introduced the concept of "netid" which is a string that is
mapped to a set of transport capabilities via a netconfig database.
RPC services register a netid and bindaddr with their local rpcbind
daemon to advertise their ability to support particular transports.

Mike Eisler noted that the use of the term "netid" in nfs(5) is not
appropriate, since Linux does not treat the value of the proto= or
mountproto= options as a netid proper, but rather to select a
particular transport capability provided locally on the client.

The Linux NFS client currently uses a simple internal mapping between
these names and its own transport capabilities rather than using the
names as part of an rpcbind query, thus these strings are really not
netids. They are more akin to what TI-RPC calls "protocol names".

Remove the term "netid" from nfs(5) for now.

Signed-off-by: Chuck Lever <[email protected]>
Cc: Mike Eisler <[email protected]>
---

Second take. I hope I've addressed Trond's and Tom's concerns.

utils/mount/nfs.man | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man
index 0fc5079..c625ee2 100644
--- a/utils/mount/nfs.man
+++ b/utils/mount/nfs.man
@@ -411,15 +411,15 @@ for mounting the
.B nfs
file system type.
.TP 1.5i
-.BI proto= netid
-The transport protocol used by the NFS client
+.BI proto= name
+The transport the NFS client uses
to transmit requests to the NFS server for this mount point.
-.I netid
+.I name
can be either
.B udp
or
.BR tcp .
-Each transport protocol uses different default
+Each transport uses different default
.B retrans
and
.B timeo
@@ -489,18 +489,18 @@ or the server's mountd service is not available on the advertised port.
This option can be used when mounting an NFS server
through a firewall that blocks the rpcbind protocol.
.TP 1.5i
-.BI mountproto= netid
-The transport protocol used by the NFS client
+.BI mountproto= name
+The transport the NFS client uses
to transmit requests to the NFS server's mountd service when performing
this mount request, and when later unmounting this mount point.
-.I netid
+.I name
can be either
.B udp
or
.BR tcp .
.IP
This option can be used when mounting an NFS server
-through a firewall that blocks a particular transport protocol.
+through a firewall that blocks a particular transport.
When used in combination with the
.B proto
option, different transports for mountd requests and NFS requests
@@ -638,10 +638,10 @@ for mounting the
.B nfs4
file system type.
.TP 1.5i
-.BI proto= netid
-The transport protocol used by the NFS client
+.BI proto= name
+The transport the NFS client uses
to transmit requests to the NFS server for this mount point.
-.I netid
+.I name
can be either
.B udp
or