Module Name: src
Committed By: pooka
Date: Fri Dec 31 17:59:24 UTC 2010
Modified Files:
src/tests/fs/nfs/nfsservice: mountd.c
Log Message:
Don't broadcast unmntall with SIGTERM -- it just makes the atf default
cleanup kill hang for a while.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nfs/nfsservice/mountd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/nfsservice/mountd.c
diff -u src/tests/fs/nfs/nfsservice/mountd.c:1.4 src/tests/fs/nfs/nfsservice/mountd.c:1.5
--- src/tests/fs/nfs/nfsservice/mountd.c:1.4 Wed Jul 28 15:15:22 2010
+++ src/tests/fs/nfs/nfsservice/mountd.c Fri Dec 31 17:59:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.4 2010/07/28 15:15:22 pooka Exp $ */
+/* $NetBSD: mountd.c,v 1.5 2010/12/31 17:59:24 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.4 2010/07/28 15:15:22 pooka Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.5 2010/12/31 17:59:24 pooka Exp $");
#endif
#endif /* not lint */
@@ -210,7 +210,9 @@
static int put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *));
static int scan_tree __P((struct dirlist *, struct sockaddr *));
static void send_umntall __P((int));
+#if 0
static int umntall_each __P((caddr_t, struct sockaddr_in *));
+#endif
static int xdr_dir __P((XDR *, char *));
static int xdr_explist __P((XDR *, caddr_t));
static int xdr_fhs __P((XDR *, caddr_t));
@@ -2386,11 +2388,14 @@
send_umntall(n)
int n;
{
+#if 0
(void)clnt_broadcast(RPCPROG_MNT, RPCMNT_VER1, RPCMNT_UMNTALL,
xdr_void, NULL, xdr_void, NULL, (resultproc_t)umntall_each);
+#endif
exit(0);
}
+#if 0
static int
umntall_each(resultsp, raddr)
caddr_t resultsp;
@@ -2398,6 +2403,7 @@
{
return (1);
}
+#endif
/*
* Free up a group list.
