Rename add_mtab2() to del_mtab()

add_mtab2 is used to remove an entry from mtab, rename it to del_mtab.

Signed-off-by: Wei Yongjun <yjwei@nanjing-fnst.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index c91bfd2d9958ba41c5519d34f074ae09d20ae704..f6294d4e5c83fcd96a09c057a41d163f33e4fc06 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -139,7 +139,7 @@ static void complain(int err, const char *dev) {
   }
 }
 
-int add_mtab2(const char *spec, const char *node, const char *type,
+int del_mtab(const char *spec, const char *node, const char *type,
                const char *opts, struct mntentchn *mc)
 {
        int umnt_err, umnt_err2, res;
@@ -375,13 +375,13 @@ int nfsumount(int argc, char *argv[])
        if(mc) {
                ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
                if(ret)
-                       ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,
+                       ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir,
                                mc->m.mnt_type, mc->m.mnt_opts, mc);
        }
        else {
                ret = _nfsumount(spec, NULL);
                if(ret)
-                       ret = add_mtab2(spec, spec, spec, spec, NULL);
+                       ret = del_mtab(spec, spec, spec, spec, NULL);
        }
 
        return(ret);