nfs-utils.git
12 years agonfsstat: Add -S/--since flag.
david m. richter [Mon, 13 Aug 2007 19:16:14 +0000 (15:16 -0400)]
nfsstat: Add -S/--since flag.

Read statistics from the file given with -S/--since and display
the difference between those and the current statistics.  Valid stat files
are those in the form of /proc/net/rpc/nfs, /proc/net/rpc/nfsd, or any
"pretty" output from nfsstat itself.  Statistics that are missing from a
"pretty" stat file are treated as zeroes.

Similar to Neil Brown's suggestion, one might use this in
conjunction with watch(1) like this:

$ watch "nfsstat --since /tmp/stats; nfsstat >/tmp/stats"

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: #define stat header labels.
david m. richter [Mon, 13 Aug 2007 19:15:57 +0000 (15:15 -0400)]
nfsstat: #define stat header labels.

Make #defines for the stat header labels, use for output, and add
to struct statinfo.  This will be used by a subsequent patch for
-S/--since.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: Remove some pointer comparisons against global statinfos.
david m. richter [Mon, 13 Aug 2007 19:15:48 +0000 (15:15 -0400)]
nfsstat: Remove some pointer comparisons against global statinfos.

Pass-in an "is_srv" arg instead of doing pointer comparisons
against the static statinfo arrays themselves.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: Obviate and remove copy_stats().
david m. richter [Mon, 13 Aug 2007 19:15:40 +0000 (15:15 -0400)]
nfsstat: Obviate and remove copy_stats().

Rather than copying stats during --sleep, instead introduce a few
pointers and rearrange them to avoid the copy.  Will be useful with
--since, too.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: rename *_tmp variables to *_old.
david m. richter [Mon, 13 Aug 2007 19:15:31 +0000 (15:15 -0400)]
nfsstat: rename *_tmp variables to *_old.

To make a subsequent patch a little clearer, make it explicit that
current *_tmp variables are actually always/only the "old" set used in
comparisons.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoRestrict -i option to root.
Neil Brown [Fri, 10 Aug 2007 23:52:29 +0000 (09:52 +1000)]
Restrict -i option to root.

As it is still under development, don't expose it - just in case.

Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Enable mount.nfs to do text-based mount support
Chuck Lever [Fri, 10 Aug 2007 22:20:01 +0000 (18:20 -0400)]
mount.nfs: Enable mount.nfs to do text-based mount support

A new command line option, "-i", is added to mount.nfs to force the use of
the string interface for testing purposes.  "-s", "-t", and "-r" are
already taken or have legacy meaning so I picked "-i".

At some later point, when everyone is comfortable with the string mount
option parsing implementation, we will add a switch based on kernel
version, and remove the "-i" command line option.  For now, I am more
comfortable enabling it by hand instead.

Since this is a temporary arrangement, I'm leaving the option undocumented
in the mount.nfs man page.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Add new files for supporting string-ified mount options
Chuck Lever [Fri, 10 Aug 2007 22:19:55 +0000 (18:19 -0400)]
mount.nfs: Add new files for supporting string-ified mount options

Introduce support files which contain code that builds string mount
options and passes them to the kernel.  This is a pre-requisite for
actually enabling /sbin/mount.nfs to do text-based mounts.

This is only partially complete at the moment, but is presented so that
folks can start banging on the kernel mount option string parsing code.
There are clearly still parts that are not implemented quite yet, such
as bg and retry support, but it should be enough to get going.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Replace a "return 0; " that should be an "exit(0); "
Chuck Lever [Fri, 10 Aug 2007 22:19:50 +0000 (18:19 -0400)]
mount.nfs: Replace a "return 0; " that should be an "exit(0); "

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Treat another UDP/TCP pair of strings like the rest
Chuck Lever [Fri, 10 Aug 2007 22:19:45 +0000 (18:19 -0400)]
mount.nfs: Treat another UDP/TCP pair of strings like the rest

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: Update umount.nfs(8)
Chuck Lever [Thu, 9 Aug 2007 21:37:01 +0000 (17:37 -0400)]
umount.nfs: Update umount.nfs(8)

Account for recent changes to the umount.nfs command.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Update the mount.nfs(8) man page
Chuck Lever [Thu, 9 Aug 2007 21:36:56 +0000 (17:36 -0400)]
mount.nfs: Update the mount.nfs(8) man page

Account for recent changes to the mount.nfs command.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfs-utils: specify a create mode with open(...O_CREAT) call in xflock
Jeff Layton [Tue, 7 Aug 2007 12:01:08 +0000 (08:01 -0400)]
nfs-utils: specify a create mode with open(...O_CREAT) call in xflock

The xflock function can create a file via open() with O_CREAT, but does
not specify the create mode when it does so. I think 0644 should be
appropriate given the current usage of this function.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoRemove ARCH-specific compile flags for ALPHA.
Neil Brown [Thu, 9 Aug 2007 01:23:24 +0000 (11:23 +1000)]
Remove ARCH-specific compile flags for ALPHA.

 -mno-fp-regs -ffixed-8

are used for compiling the kernel on alphas, and it seems they
were copied into nfs-utils long ago, even though they have no
relevance now.
As we now use floating point (just a little bit in nfsstat), remove
these pointless flags.

12 years agonfsstat: include -Z/--sleep in the manpage
david m. richter [Tue, 7 Aug 2007 23:53:48 +0000 (19:53 -0400)]
nfsstat: include -Z/--sleep in the manpage

Add a little blurb about -Z/--sleep to the nfsstat manpage.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: rename --diff-stat to --sleep
david m. richter [Tue, 7 Aug 2007 23:53:11 +0000 (19:53 -0400)]
nfsstat: rename --diff-stat to --sleep

As per Bruce Fields' suggestion, rename the clunky -D/--diff-stat
to the more-intuitive -Z/--sleep.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: fix a bug in diff_stats()
david m. richter [Tue, 7 Aug 2007 23:53:00 +0000 (19:53 -0400)]
nfsstat: fix a bug in diff_stats()

Fix a bug in diff_stats() that causes false-positives in
has_stats(), which can result in a bunch of zeros being displayed instead
of suppressed as intended.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: add a comment to has_stats()
david m. richter [Tue, 7 Aug 2007 23:52:50 +0000 (19:52 -0400)]
nfsstat: add a comment to has_stats()

Clarify what has_stats() is actually doing.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: display 3 additional NFSv4 client op counters
david m. richter [Tue, 7 Aug 2007 23:52:39 +0000 (19:52 -0400)]
nfsstat: display 3 additional NFSv4 client op counters

Display three extra NFSv4 client counters that are already exposed
in /proc/net/rpc/nfs: GETACL, SETACL, and FS_LOCATIONS.  Won't cause
trouble on older kernels that might lack those counters.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agofix regression with rmtab handling in newer nfs-utils code
Jeff Layton [Mon, 6 Aug 2007 23:18:58 +0000 (19:18 -0400)]
fix regression with rmtab handling in newer nfs-utils code

commit dbfcba5b03481d49f3e78946fe8fd066e2025545
incorrectly added some mountlist_add calls.
Removed them again.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Fix background mounts
Chuck Lever [Fri, 3 Aug 2007 17:24:15 +0000 (13:24 -0400)]
mount.nfs: Fix background mounts

The new mount.nfs helper does not support background mounts.  Add support
for background mounts.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Refactor mount logic to allow support for "bg" option
Chuck Lever [Fri, 3 Aug 2007 17:24:10 +0000 (13:24 -0400)]
mount.nfs: Refactor mount logic to allow support for "bg" option

Refactor main() a bit to make adding support for "bg" option easier.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: restore bg argument to nfsmount() and nfs4mount()
Chuck Lever [Fri, 3 Aug 2007 17:24:05 +0000 (13:24 -0400)]
mount.nfs: restore bg argument to nfsmount() and nfs4mount()

To enable background mounting again, restore the "bg" argument to
nfsmount() and nfs4mount() that was recently removed.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: get_socket() may clobber errno, but preserves .re_errno
Chuck Lever [Fri, 3 Aug 2007 17:24:00 +0000 (13:24 -0400)]
mount.nfs: get_socket() may clobber errno, but preserves .re_errno

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 <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Always close the socket at the end of getport()
Chuck Lever [Fri, 3 Aug 2007 17:23:54 +0000 (13:23 -0400)]
mount.nfs: Always close the socket at the end of getport()

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Shorter timeout for TCP connects
Chuck Lever [Fri, 3 Aug 2007 17:23:49 +0000 (13:23 -0400)]
mount.nfs: Shorter timeout for TCP connects

The standard TCP connect timeout on Linux is 75 seconds, which can be
too long in some cases.  The timeout itself can be altered on a system-wide
basis, but we'd like mount to have it's own connect timeout that's tunable,
and defaults to a shorter value.

The get_socket() function is a utility function that does TCP connects for
getport, clnt_ping, and other functions.  Add logic there to use a
non-blocking connect() and select() in order to time out a connect
operation that's taking too long.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Remove a redundant port assignment
Chuck Lever [Fri, 3 Aug 2007 17:23:44 +0000 (13:23 -0400)]
mount.nfs: Remove a redundant port assignment

getport() always fills in its port number before calling GETPORT.  No need
for the caller to do this.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: umount needs to pick up transport option from /etc/mtab
Chuck Lever [Fri, 3 Aug 2007 17:23:39 +0000 (13:23 -0400)]
mount.nfs: umount needs to pick up transport option from /etc/mtab

Now that umount's default transport protocol has become more flexible, it
will need to detect both proto=udp and proto=tcp in /etc/mtab.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG
Chuck Lever [Fri, 3 Aug 2007 17:23:34 +0000 (13:23 -0400)]
mount.nfs: fix printf's normally hidden behind NFS_MOUNT_DEBUG

After I enabled NFS_MOUNT_DEBUG the compiler started spitting out warnings.
Fix up commas, output formatting, and double-wide character support.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Support double-wide characters in printed strings
Chuck Lever [Fri, 3 Aug 2007 17:23:29 +0000 (13:23 -0400)]
mount.nfs: Support double-wide characters in printed strings

Previous NLS changes missed a spot or two.  This patch tries to get
most of them, but probably misses a few more.

In errors.c:mount_errors() I've removed a period at the end of the error
messages; this is consistent with other error messages I've examined.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: add -D/--diff-stat
david m. richter [Tue, 31 Jul 2007 21:39:49 +0000 (17:39 -0400)]
nfsstat: add -D/--diff-stat

Add -D/--diff-stat: instead of immediately displaying total
collected NFS stats and exiting, nfsstat will take a snapshot of current
statistics and pause until the user hits ^C, at which point it takes a
second snapshot and then prints out the difference of the two; i.e.,
only the statistics collected during the pause.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: just declare -D/--diff-stat's variables
david m. richter [Tue, 31 Jul 2007 21:39:42 +0000 (17:39 -0400)]
nfsstat: just declare -D/--diff-stat's variables

Add the temp vars -D/--diff-stat will use.  (just using a separate
patch to make the next one easier to read)

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: use macros to declare struct statinfo arrays
david m. richter [Tue, 31 Jul 2007 21:39:30 +0000 (17:39 -0400)]
nfsstat: use macros to declare struct statinfo arrays

Use macros to build the arrays of struct statinfos.  This will
make adding the extra set of temporary variables needed by -D/--diff-stat
much easier.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: standardize naming of opcount arrays
david m. richter [Tue, 31 Jul 2007 21:39:23 +0000 (17:39 -0400)]
nfsstat: standardize naming of opcount arrays

Standardized Naming 2: Make the client and server "call counts"
arrays' variable names reflect/include the actual text labels from the
/proc files -- e.g., "cltv2info" becomes "cltproc2info".  A subsequent
patch will rely on this naming scheme.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: standardize naming of server variables
david m. richter [Tue, 31 Jul 2007 21:39:16 +0000 (17:39 -0400)]
nfsstat: standardize naming of server variables

Standardized Naming 1: Instead of having a variety of different
server-related variable name prefixes ("srv", "svr", "svc", "SVC"), set
them all to "srv" or "SRV".  A subsequent patch will rely on this naming
scheme.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: add get_stats()
david m. richter [Tue, 31 Jul 2007 21:39:11 +0000 (17:39 -0400)]
nfsstat: add get_stats()

Share some of the existing statistics-gathering code by folding it
into a function, get_stats().

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agonfsstat: add has_stats()
david m. richter [Tue, 31 Jul 2007 21:39:02 +0000 (17:39 -0400)]
nfsstat: add has_stats()

To help readability, add has_stats() and use it when deciding
whether to print.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoFix more 'prototype' warnings and other warnings.
Neil Brown [Mon, 30 Jul 2007 06:33:39 +0000 (16:33 +1000)]
Fix more 'prototype' warnings and other warnings.

Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: clean up a couple of printfs in fstab.c
Chuck Lever [Sat, 28 Jul 2007 21:51:06 +0000 (17:51 -0400)]
mount.nfs: clean up a couple of printfs in fstab.c

Clean up for consistent use.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: eliminate another dependency on a global variable
Chuck Lever [Sat, 28 Jul 2007 21:51:00 +0000 (17:51 -0400)]
libnfs.a: eliminate another dependency on a global variable

The file support/nfs/fstab.c, which is linked into libnfs.a, depends on the
global variable "verbose."  This variable is defined and used only in the
mount command, and the functions in fstab.c are used only by the mount
command.

Move fstab.c and support/include/fstab.h to utils/mount.  This file
placement is also consistent with at least one other mount helper,
mount.ocfs2.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: eliminate conn.c and conn.h
Chuck Lever [Sat, 28 Jul 2007 21:50:55 +0000 (17:50 -0400)]
libnfs.a: eliminate conn.c and conn.h

conn.[ch] are now no longer needed.  Clean them out and delete them.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: use nfs_error instead of fprintf in get_socket()
Chuck Lever [Sat, 28 Jul 2007 21:50:50 +0000 (17:50 -0400)]
mount.nfs: use nfs_error instead of fprintf in get_socket()

Use nfs_error() where appropriate.  I used "goto" here to reduce string
splitting and indenting past the point of readability.  Gee, it would be
nice if C had proper exception handling...

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: move get_socket() function to utils/mount/network.c
Chuck Lever [Sat, 28 Jul 2007 21:50:45 +0000 (17:50 -0400)]
libnfs.a: move get_socket() function to utils/mount/network.c

Now we can address the real problem: that get_socket() depends on the
global variable "verbose" which is only available in the mount command.

Move get_socket() into utils/mount/network.c, and make it static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: move clnt_ping() to utils/mount
Chuck Lever [Sat, 28 Jul 2007 21:50:40 +0000 (17:50 -0400)]
libnfs.a: move clnt_ping() to utils/mount

Continue clean up of mount functionality in libnfs.a by moving clnt_ping()
to utils/mount/network.c.  Note that socklen_t is an unsigned int... the
i386 gcc compiler threw a signedness warning about the 3rd argument of
getsockname().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: move more mount-only functions out of libnfs.a
Chuck Lever [Sat, 28 Jul 2007 21:50:35 +0000 (17:50 -0400)]
libnfs.a: move more mount-only functions out of libnfs.a

Continue clean-up with nfsvers_to_mnt() and mntvers_to_nfs().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agolibnfs.a: move mnt_{open, close}clnt calls to utils/mount/network.c
Chuck Lever [Sat, 28 Jul 2007 21:50:30 +0000 (17:50 -0400)]
libnfs.a: move mnt_{open, close}clnt calls to utils/mount/network.c

It turns out that get_socket() accesses a global variable, "verbose," that
is only available in the mount command; yet it's in libnfs.a.  This creates
an undocumented API dependency that will bite someone someday.  This
mount-specific functionality doesn't really belong in libnfs.a anyway.

The simplest way to resolve this is to move all of the functions in
support/nfs/conn.c into utils/mount.  network.c seems like the logical
place to put these.  An added benefit is we eventually get to make
get_socket() static.

Let's start with the mnt_{open,close}clnt functions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: clean up getport() function
Chuck Lever [Sat, 28 Jul 2007 21:50:24 +0000 (17:50 -0400)]
mount.nfs: clean up getport() function

Mostly comment clarification.  Also replace some naked undocumented
integers with macros, and make getport() static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: fix hang when getport() uses TCP against unavailable servers
Chuck Lever [Sat, 28 Jul 2007 21:50:19 +0000 (17:50 -0400)]
mount.nfs: fix hang when getport() uses TCP against unavailable servers

If get_socket() can't get us an open TCP socket, we know the server is
down, so make  getport() exit early instead of hanging.  This logic is
copied from clnt_ping().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: eliminate a nearly empty header file.
Chuck Lever [Sat, 28 Jul 2007 21:50:14 +0000 (17:50 -0400)]
umount.nfs: eliminate a nearly empty header file.

Clean-up: move nfsumount() global declaration to nfs_mount.h, and remove
nfsumount.h.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: Pass return codes from do_nfs_umount back
Chuck Lever [Sat, 28 Jul 2007 21:50:09 +0000 (17:50 -0400)]
umount.nfs: Pass return codes from do_nfs_umount back

Do we really care about these return codes?

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: Make do_nfs_mount use conventional EX_ style return codes
Chuck Lever [Sat, 28 Jul 2007 21:50:04 +0000 (17:50 -0400)]
umount.nfs: Make do_nfs_mount use conventional EX_ style return codes

do_nfs_mount() should return EX_ style return codes and not 1 or 0 in order
to distinguish between usage errors and other problems (such as EX_FILEIO
or RPC errors).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: make _nfsumount() static
Chuck Lever [Sat, 28 Jul 2007 21:49:59 +0000 (17:49 -0400)]
umount.nfs: make _nfsumount() static

_nfsumount() is never called outside of nfsumount.c.  Also give it a more
conventional name.

Note that it's return code is ignored.  That will be addressed in a
subsequent patch.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: make del_mtab() a static function
Chuck Lever [Sat, 28 Jul 2007 21:49:54 +0000 (17:49 -0400)]
umount.nfs: make del_mtab() a static function

Clean-up: del_mtab() isn't used outside of nfsumount.c.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoMake sure nfs_call_umount's callers are handling its return code correctly
Chuck Lever [Sat, 28 Jul 2007 21:49:49 +0000 (17:49 -0400)]
Make sure nfs_call_umount's callers are handling its return code correctly

umount.nfs is treating nfs_call_umount's return code like a standard mount
return code (EX_SOMETHING) when its really an RPC return code.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: move nfs_call_umount to network.c
Chuck Lever [Sat, 28 Jul 2007 21:49:43 +0000 (17:49 -0400)]
umount.nfs: move nfs_call_umount to network.c

nfs_call_umount() is shared by nfsmount.c and nfsumount.c, and manages a
network function (building the RPC umount call to the server's MNT daemon).
So move it to network.c with other network-related functions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: make umount_usage() static
Chuck Lever [Sat, 28 Jul 2007 21:49:38 +0000 (17:49 -0400)]
umount.nfs: make umount_usage() static

No good reason to export umount_usage.  Make it static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: make umount.nfs use UDP by default
Chuck Lever [Sat, 28 Jul 2007 21:49:33 +0000 (17:49 -0400)]
umount.nfs: make umount.nfs use UDP by default

mount.nfs currently uses UDP by default when calling a MNT server.  Make
umount.nfs do the same.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoumount.nfs: some umount.nfs error return codes are confusing
Chuck Lever [Sat, 28 Jul 2007 21:49:28 +0000 (17:49 -0400)]
umount.nfs: some umount.nfs error return codes are confusing

umount.nfs should return the standard EX_ mount return codes.  At some
point in the past, it was returning 0 for failure and 1 for success, and
some of these have been changed and some haven't.  See if we can rectify
this.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: fix more nits with error messages
Chuck Lever [Sat, 28 Jul 2007 21:49:23 +0000 (17:49 -0400)]
mount.nfs: fix more nits with error messages

Catch-all.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoAdd -Wstrict-prototypes to compiler args, and fix warnings caused.
Neil Brown [Sun, 29 Jul 2007 07:20:10 +0000 (17:20 +1000)]
Add -Wstrict-prototypes to compiler args, and fix warnings caused.

12 years agoUse __fpurge to ensure single-line writes to cache files
J. Bruce Fields [Thu, 26 Jul 2007 20:30:46 +0000 (16:30 -0400)]
Use __fpurge to ensure single-line writes to cache files

On a recent Debian/Sid machine, I saw libc retrying stdio writes that
returned write errors.  The result is that if an export downcall returns
an error (which it can in normal operation, since it currently
(incorrectly) returns -ENOENT on any negative downcall), then subsequent
downcalls will write multiple lines (including the original line that
received the error).

The result is that the server fails to respond to any rpc call that
refers to an unexported mount point (such as a readdir of a directory
containing such a mountpoint), so client commands hang.

I don't know whether this libc behavior is correct or expected, but it
seems safest to add the __fpurge() (suggested by Neil) to ensure data is
thrown away.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agofix broken compile due to missing pseudoflavors.h
J. Bruce Fields [Mon, 16 Jul 2007 17:06:08 +0000 (13:06 -0400)]
fix broken compile due to missing pseudoflavors.h

Commit e9b0bed761bc77ba046f53be2ec324c4b61357ff should also have added
this file.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: White space clean up
Chuck Lever [Mon, 16 Jul 2007 20:29:32 +0000 (16:29 -0400)]
mount.nfs: White space clean up

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Use nfs_error in nfsmount.c, nfsumount.c, and nfs4mount.c
Chuck Lever [Mon, 16 Jul 2007 20:29:27 +0000 (16:29 -0400)]
mount.nfs: Use nfs_error in nfsmount.c, nfsumount.c, and nfs4mount.c

Clean up. - fprintf becomes nfs_error

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Error handling clean-up
Chuck Lever [Mon, 16 Jul 2007 20:29:22 +0000 (16:29 -0400)]
mount.nfs: Error handling clean-up

o  Use nfs_error( _() ) instead of fprintf(stderr,
o  Use the mount return code macros instead of bare integers
o  Free mount_point after it has been canonicalized

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: When -v is set and the mount succeeds, print the mount info
Chuck Lever [Mon, 16 Jul 2007 20:29:17 +0000 (16:29 -0400)]
mount.nfs: When -v is set and the mount succeeds, print the mount info

Add a bit of logic that appears to be in other mount helpers.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoRemove the running_bg parameter
Chuck Lever [Mon, 16 Jul 2007 20:29:12 +0000 (16:29 -0400)]
Remove the running_bg parameter

Clean up: when nfsmount and nfs4mount are called, running_bg is always set
to zero.  Remove the parameter from the call.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Change *flags to flags
Chuck Lever [Mon, 16 Jul 2007 20:29:06 +0000 (16:29 -0400)]
mount.nfs: Change *flags to flags

It's not necessary to treat the *flags parameter to nfsmount and nfs4mount
as an output parameter.  Nothing is passed back.  Replace it with a normal
call-by-value.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: No need to return nfs_mount_data structs
Chuck Lever [Mon, 16 Jul 2007 20:29:01 +0000 (16:29 -0400)]
mount.nfs: No need to return nfs_mount_data structs

Refactor mount processing slightly to remove an output parameter and an
unnecessary type cast.  The mount syscall is now made from inside
nfs_mount or nfs4mount, rather than in common code after those are called.

Code review suggests that EX_BG was never returned by mount.nfs because the
logic I just replaced was always returning EX_FAIL.  The new logic should
properly return EX_BG when appropriate.

However, it is unclear whether /bin/mount handles backgrounding the mount
request, or whether mount.nfs should.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Move MS_DUMMY and friends to header file
Chuck Lever [Mon, 16 Jul 2007 20:28:56 +0000 (16:28 -0400)]
mount.nfs: Move MS_DUMMY and friends to header file

We move the definitions of MS_USER and friends to our local copy of
mount_constants.h.  These will need to be available in nfsmount.c and
nfs4mount.c when we move the mount system call out of mount.c.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Move start_statd into nfs_mount
Chuck Lever [Mon, 16 Jul 2007 20:28:51 +0000 (16:28 -0400)]
mount.nfs: Move start_statd into nfs_mount

Move start_startd into network.c, and move the call inside of
nfs_mount, instead of immediately after - conceptually a better place
for it.

Also fix a minor nit:  Since the mount actually fails if start_statd
doesn't work, cause mount.nfs to exit with a status of EX_FAIL.

Still need to do something about "running_bg" in nfsmount.c:nfsmount().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Move network functions into a common source module
Chuck Lever [Mon, 16 Jul 2007 20:28:46 +0000 (16:28 -0400)]
mount.nfs: Move network functions into a common source module

Separate network oriented functions from filesystem oriented
functions, for general cleanliness.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Eliminate some C macros that use implicit arguments
Chuck Lever [Mon, 16 Jul 2007 20:28:41 +0000 (16:28 -0400)]
mount.nfs: Eliminate some C macros that use implicit arguments

Get rid of nfs_probelist, mnt_probelist, and proto_probelist in order to
remove the use of HAVE_RELIABLE_TCP, MAX_NFSPROT, and MAX_MNTPROT.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Always preset nfs_mount_version
Chuck Lever [Mon, 16 Jul 2007 20:28:36 +0000 (16:28 -0400)]
mount.nfs: Always preset nfs_mount_version

nfs_mount_version is a global integer that is set based on a guess
about which nfs_mount_data version is appropriate for the kernel we're
running on.

Make it always available and have the correct value before calling mount
and unmount so they don't have to worry about setting it themselves.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Create a common source module for reporting mount errors
Chuck Lever [Mon, 16 Jul 2007 20:28:31 +0000 (16:28 -0400)]
mount.nfs: Create a common source module for reporting mount errors

Clean up, and pre-requisite for subsequent fixes.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: clean-up add_mtab
Chuck Lever [Mon, 16 Jul 2007 20:28:26 +0000 (16:28 -0400)]
mount.nfs: clean-up add_mtab

Clean up add_mtab(), and make /sbin/mount.nfs[4] return a proper error if
it fails.

Also include an unbalanced unlock_mtab() noticed by Steve D.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: /bin/mount already handles --bind & friends
Chuck Lever [Mon, 16 Jul 2007 20:28:20 +0000 (16:28 -0400)]
mount.nfs: /bin/mount already handles --bind & friends

Clean-up: remove logic to handle --bind and other such command-line
options from mount.nfs[4].

These options are already handled in /bin/mount, and the logic for handling
them in the NFS helper is currently disabled.  Other helpers such as
mount.ocfs2 appear not to support --bind (ie. they rely on /bin/mount to
do it).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Remove support for "-t" option
Chuck Lever [Mon, 16 Jul 2007 20:28:15 +0000 (16:28 -0400)]
mount.nfs: Remove support for "-t" option

/bin/mount will never pass "-t" to a mount helper, since it passes the
fs-type in the name of the program it is executing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agomount.nfs: Simplify generation of progname
Chuck Lever [Mon, 16 Jul 2007 20:28:10 +0000 (16:28 -0400)]
mount.nfs: Simplify generation of progname

Use basename() instead of our own majick.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agorpcdebug: Update 'rpcdebug' tool with recently added debugging flags
Chuck Lever [Mon, 16 Jul 2007 20:28:05 +0000 (16:28 -0400)]
rpcdebug: Update 'rpcdebug' tool with recently added debugging flags

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoFix umount.nfs exit status
Steinar H. Gunderson [Sat, 14 Jul 2007 09:18:48 +0000 (11:18 +0200)]
Fix umount.nfs exit status

Hi,

As per a bug report from a user:

mount.c seems to assume that nfsumount() uses standard C true/false
return values, and inverts them for the exit status (where 0 is
traditionally considered success). However, nfsumount() consistently
seems to use 0 for success, and thus a success gets returned as exit
status 1 and a failure as exit status 0. This confuses at least
the GNOME drive manager applet, and probably others as well.

Signed-off-by: Steinar H. Gunderson <sesse@debian.org>
Signed-off-by: Neil Brown <neilb@suse.de>
12 years agoAdded missing unlock_mtab() call in the add_mtab()
Steve Dickson [Thu, 10 May 2007 20:02:15 +0000 (16:02 -0400)]
Added missing unlock_mtab() call in the add_mtab()
routine.

Signed-off-by: Steve Dickson <steved@redhat.com>
12 years agoThe wrong bit field is being passed to NFSCTL_TCPISSET()
Steve Dickson [Thu, 10 May 2007 19:04:07 +0000 (15:04 -0400)]
The wrong bit field is being passed to NFSCTL_TCPISSET()
during one of the sanity checks in rpc.nfsd.

Signed-off-by: Steve Dickson <steved@redhat.com>
13 years agodocument the sec= option
J. Bruce Fields [Thu, 5 Jul 2007 17:45:54 +0000 (13:45 -0400)]
document the sec= option

Document the sec= option in the exports man page.

Not done: it would be nice to have an example or two here (and not just
in the final "EXAMPLE" section, though that would be nice too).  I was
just too lazy to figure out the formatting.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agoSupport sec= option to specify export security
J. Bruce Fields [Thu, 5 Jul 2007 17:45:53 +0000 (13:45 -0400)]
Support sec= option to specify export security

This adds support for reading sec= option and sending security data
through cache via "... secinfo n flavor1 flag1 ... flavorN flagN".

If sec= is missing, no secinfo option will be passed down.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agomove pseudoflavor information to common code
J. Bruce Fields [Thu, 5 Jul 2007 17:45:52 +0000 (13:45 -0400)]
move pseudoflavor information to common code

I'd like to be able to use the same pseudoflavor data in exportfs and
mountd; so move it to nfslib and a common include.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agofix warnings in mount.c
J. Bruce Fields [Thu, 5 Jul 2007 17:45:51 +0000 (13:45 -0400)]
fix warnings in mount.c

The compiler is warning because we aren't properly specifying the type
of the chk_mountpoint argument.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agogitignore updates
J. Bruce Fields [Thu, 5 Jul 2007 17:45:50 +0000 (13:45 -0400)]
gitignore updates

Update gitignore to ignore some generated files.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agomount.nfs: Fix retry= to handle lack of reserved port situation
Flavio Leitner [Tue, 10 Jul 2007 00:23:27 +0000 (10:23 +1000)]
mount.nfs: Fix retry= to handle lack of reserved port situation

In the case of several (>500) mounts running at the same time
with -o tcp, the number of attempts that succeed is about 300-500
because it run out of priviledged port (they are busy in TIME_WAIT
state).

Signed-off-by: Flavio Leitner <flavio.leitner@gmail.com>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agoconfigure changed to corrently report the default for --enable-mount
Neil Brown [Tue, 10 Jul 2007 00:07:25 +0000 (10:07 +1000)]
configure changed to corrently report the default for --enable-mount

The default for "--enable-mount" was changed to 'yes' sometime ago,
but the help message in ./configure wasn't updated to match this.

Thanks to Chuck Level for pointing this out.

Signed-off-by: Neil Brown <neilb@suse.de>
13 years agomount.nfs: Add the mount option "nosharecache"
Trond Myklebust [Tue, 10 Jul 2007 00:03:22 +0000 (10:03 +1000)]
mount.nfs: Add the mount option "nosharecache"

Prior to David Howell's mount changes in 2.6.18, users who mounted
different directories which happened to be from the same filesystem on the
server would get different super blocks, and hence could choose different
mount options. As long as there were no hard linked files that crossed from
one subtree to another, this was quite safe.
Post the changes, if the two directories are on the same filesystem (have
the same 'fsid'), they will share the same super block, and hence the same
mount options.

Add a flag to allow users to elect not to share the NFS super block with
another mount point, even if the fsids are the same. This will allow
users to set different mount options for the two different super blocks, as
was previously possible. It is still up to the user to ensure that there
are no cache coherency issues when doing this, however the default
behaviour will be to share super blocks whenever two paths result in
the same fsid.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agomount.nfs - NFSv4 mounts give wrong error message when server denies the mount
Steve Dickson [Thu, 17 May 2007 00:04:19 +0000 (10:04 +1000)]
mount.nfs - NFSv4 mounts give wrong error message when server denies the mount

When nfs4 mount fail because the exported directory does
not exist, the mount command claims the local mount point
does not exist which is wrong. This patch fixes that problem
as well as  makes the v4 mount failures look like v3/v2 failures.

Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>
13 years agoMemory leak in mountd
Steinar H. Gunderson [Fri, 11 May 2007 11:02:09 +0000 (21:02 +1000)]
Memory leak in mountd

In client_compose(), free() the hostent structure returned before
exiting. Normally, gethostbyaddr() returns a pointer to a static
struct, but this hostent comes from either get_reliable_hostbyaddr() or
get_hostent(), both which return a pointer they privately xmalloc()ed,
which thus can and should be free()d.

Signed-Off-By: Steinar H. Gunderson <sesse@debian.org>
13 years agoRelease 1.1.0 nfs-utils-1-1-0
Neil Brown [Fri, 11 May 2007 03:40:57 +0000 (13:40 +1000)]
Release 1.1.0

Update verison numbers(s) and make sure NEWS is uptodate.

13 years agonfs-utils: have mountd hold open etab file to force inode number to change
Jeff Layton [Wed, 9 May 2007 14:19:33 +0000 (10:19 -0400)]
nfs-utils: have mountd hold open etab file to force inode number to change

This patch changes mountd to hold the etab file open so that when it's
changed by exportfs, the inode number should change. We then change
auth_reload to reload the file based on whether st_ino is different
from the last time it was checked. It also changes auth_reload to
maintain a static counter value and return it instead of a timestamp
and fixes up get_exportlist accordingly. Finally, it adds some
comments to xtab_write to warn people about editing the etab in place.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
13 years agomount.nfs4: Remove checks for idmapd and gssd running.
Neil Brown [Fri, 11 May 2007 03:28:53 +0000 (13:28 +1000)]
mount.nfs4: Remove checks for idmapd and gssd running.

While it is nice to have the checks, nothing in this package
creates the files that are checked, so we shouldn't check them
yet.

13 years agoRemove rquotad
Neil Brown [Tue, 8 May 2007 04:43:28 +0000 (14:43 +1000)]
Remove rquotad

rquotad isn't really used by anyone - as you can tell by the fact that
it only works for ext2 and ext3 (if those).
The 'quota' package contains a working and maintained rquota and all
distros appear to use that one.  So remove rquotad from this package
to avoid confusion.

13 years agoupdate manpages for showmount and mountd
Jeff Layton [Mon, 7 May 2007 11:53:32 +0000 (07:53 -0400)]
update manpages for showmount and mountd

This patch updates the manpages for showmount and mountd. It adds a
description of the new mountd -r option, and a caveat about the unreliability
of showmount -a.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
13 years agoDetect version of libblkid and act accordingly.
Neil Brown [Thu, 3 May 2007 00:46:02 +0000 (10:46 +1000)]
Detect version of libblkid and act accordingly.

libblkid earlier than 1.40 has a memory leak bug that make it unsuitable
for use in mountd.
So detect the version and default to not using it if too old.  Give appropriate
warnings in various cases.

13 years agoAlways get addressless tickets
Kevin Coffman [Tue, 24 Apr 2007 16:26:55 +0000 (12:26 -0400)]
Always get addressless tickets

Make sure we get addressless tickets so we can function behind a NAT.
(Must use a different function to accomplish this with Heimdal.)

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>