summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-07-28 17:49:59 -0400
committerNeil Brown <neilb@suse.de>2007-07-30 16:12:53 +1000
commit264c9705f48e145f9cb3575a953336dcd2161e49 (patch)
tree5b4355312de78df7f3340aa17c0d33cf746871cc
parent886308ab293efefd15d6ac5ef6aa2424c4695021 (diff)
downloadnfs-utils-264c9705f48e145f9cb3575a953336dcd2161e49.tar.gz
nfs-utils-264c9705f48e145f9cb3575a953336dcd2161e49.tar.xz
nfs-utils-264c9705f48e145f9cb3575a953336dcd2161e49.zip
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>
-rw-r--r--utils/mount/nfsumount.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 51349f1..18cd14b 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -124,7 +124,7 @@ static int del_mtab(const char *spec, const char *node)
/*
* Returns 1 if everything went well, else 0.
*/
-int _nfsumount(const char *spec, char *opts)
+static int do_nfs_umount(const char *spec, char *opts)
{
char *hostname;
char *dirname;
@@ -312,11 +312,11 @@ int nfsumount(int argc, char *argv[])
ret = 0;
if (mc) {
if (!lazy)
- _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+ do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
} else if (*spec != '/') {
if (!lazy)
- _nfsumount(spec, "tcp,v3");
+ do_nfs_umount(spec, "tcp,v3");
} else
ret = del_mtab(NULL, spec);