summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-10-14 10:33:25 -0400
committerSteve Dickson <steved@redhat.com>2010-10-14 10:33:25 -0400
commit849b7072a04975bb5da09245fbcacb0cb754a909 (patch)
treebd673946d899764769d67a28d54ae35261e0981f
parent93dcf64cc4a9e67f693aea35c8193428015f4a30 (diff)
downloadnfs-utils-849b7072a04975bb5da09245fbcacb0cb754a909.tar.gz
nfs-utils-849b7072a04975bb5da09245fbcacb0cb754a909.tar.xz
nfs-utils-849b7072a04975bb5da09245fbcacb0cb754a909.zip
mountd: Clear mountd registrations at start up
Clear stale MNT registrations before mountd tries to create fresh listeners, to ensure that mountd starts. This is also what statd does. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mountd/mountd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index d309950..035624c 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -99,12 +99,9 @@ static int version_any(void)
static void
unregister_services (void)
{
- if (version2()) {
- nfs_svc_unregister(MOUNTPROG, MOUNTVERS);
- nfs_svc_unregister(MOUNTPROG, MOUNTVERS_POSIX);
- }
- if (version3())
- nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3);
+ nfs_svc_unregister(MOUNTPROG, MOUNTVERS);
+ nfs_svc_unregister(MOUNTPROG, MOUNTVERS_POSIX);
+ nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3);
}
static void
@@ -840,6 +837,7 @@ main(int argc, char **argv)
if (new_cache)
cache_open();
+ unregister_services();
if (version2()) {
listeners += nfs_svc_create("mountd", MOUNTPROG,
MOUNTVERS, mount_dispatch, port);