umount.nfs: make _nfsumount() static
authorChuck Lever <chuck.lever@oracle.com>
Sat, 28 Jul 2007 21:49:59 +0000 (17:49 -0400)
committerNeil Brown <neilb@suse.de>
Mon, 30 Jul 2007 06:12:53 +0000 (16:12 +1000)
_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>
utils/mount/nfsumount.c

index 51349f1..18cd14b 100644 (file)
@@ -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);