delta/nfs-utils.git/utils/mount/network.c, branch pseudo-v4root

Recently #include directives for autoconf's config.h file were added in

2008-03-11T17:11:50+00:00

utils/mount/error.c and utils/mount/mount.c, but appropriate HAVE_CONFIG_H
checks were not added at the same time.

In addition, several other .c files under utils/mount reference
autoconf-generated HAVE_ macros, but don't appear to include config.h

Also, Heinz-Ado Arnolds  reports that this
patch is needed to ensure START_STATD is properly defined in
utils/mount/network.c.  Otherwise start_statd() is always a no-op, even if
the configure script defines an appropriate statd start-up script.

Signed-off-by: Chuck Lever 
Cc: Heinz-Ado Arnolds 
Signed-off-by: Steve Dickson

When following a list of mount versions to probe -

2007-11-03T14:36:36+00:00

e.g. probe_mnt1_first or probe_mnt3_first - probe_both will first
probe the appropriate NFS version and then, if that succeeds, probe
the actual mount version.  However instead of probing the target mount
version, it probes the "most appropriate" mount version for the given NFS version.
This results in it probing:
  NFSv2, MOUNTv1
twice rather than
  NFSv2, MOUNTv1
  NFSv2, MOUNTv2

as would be more correct.

This patch removes the "choose most correct" step and just use the
current mouint version for the probe_vers array.

Signed-off-by: Neil Brown 
Signed-off-by: Steve Dickson

This means that if mountd is run with "--no-nfs-version 3",

2007-11-03T13:35:05+00:00

It will first probe for NFS version 3, which will succeed (assuming the
kernel supported NFSv3), then it will check the matching mountd version (3)
and probe_port on discovering that isn't supported will try other versions,
find "1" is supported will succeed.

This leaves up using mount version 1 for an NFSv3 mount, which doesn't work
and leads to a SIGSEGV

There is no case where trying other versions is needed the request one is
not supported, so simply remove that code.

Signed-off-by: Neil Brown 
Signed-off-by: Steve Dickson

Fix version fallback for unmount.

2007-10-11T23:03:06+00:00

Previously, if the mtab record didn't mention a version, unmount
would assume a v3 umount and send an UNMOUNT request accordingly.
This is wrong.

So remove the 'v3' assumption, and allow probe_port to continue when
it gets a version number mis-match.

Also there was some overloading of the meaning of pm_vers==0 relating
to v4 mounts.  As do_nfs_umount is never called for v4, rename it to
do_nfs_umount23, and remove v4 handling from there and from
nfs_call_umount.

Signed-off-by: Neil Brown

mount.nfs: Provide comments for public network functions

2007-09-25T01:50:15+00:00

Clean up: Document public functions in util/mount/network.c with block
comments.

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown

mount.nfs: Create a new API to find out client's address

2007-08-24T22:19:33+00:00

Provide a version of clnt_ping() that discovers the client's address, but
doesn't do an RPC ping.  The in-kernel text-based mount code already does
a ping, so all we need here is address discovery.

As well, add a block comment in front of clnt_ping() that hopefully
elucidates the differences.

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown

mount.nfs: getport() should avoid modifying passed-in arguments

2007-08-24T03:15:02+00:00

Defensive coding: getport() shouldn't alter the passed-in server address,
but should treat it as read only.  Have it operate on a copy.

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown

mount.nfs: Treat another UDP/TCP pair of strings like the rest

2007-08-10T23:47:35+00:00

See the error messages at the end of utils/mount/network.c:get_socket()

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown

mount.nfs: get_socket() may clobber errno, but preserves .re_errno

2007-08-03T22:27:40+00:00

get_socket() guarantees that rpc_createerr.cf_error.re_errno is set
correctly after an error, but it can wipe errno if it has to print an error
message.  Make sure that clnt_ping() checks the correct error code when
get_socket() returns.

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown

mount.nfs: Always close the socket at the end of getport()

2007-08-03T22:27:40+00:00

These days, none of get_socket()'s callers pass an RPC_ANYSOCK on to the
RPC code.

Signed-off-by: Chuck Lever 
Signed-off-by: Neil Brown