From: hjl <hjl>
Date: Thu, 25 Jan 2001 21:11:18 +0000 (+0000)
Subject: 2001-01-25  H.J. Lu <hjl@lucon.org>
X-Git-Tag: nfs-utils-0-3~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=b419fe243f312c5b833530a4c0baac4b8530aed7

2001-01-25  H.J. Lu <hjl@lucon.org>

	* utils/lockd/lockd.c (main): Ignore errno == EINVAL.
---

diff --git a/ChangeLog b/ChangeLog
index 87074ea..6c280ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-25  H.J. Lu <hjl@lucon.org>
+
+	* utils/lockd/lockd.c (main): Ignore errno == EINVAL.
+
 2001-01-20  Chip Salzenberg  <chip@valinux.com>
 
 	* support/include/xio.h (xgetc): Declare to return int.
diff --git a/utils/lockd/lockd.c b/utils/lockd/lockd.c
index 05bc999..900510b 100644
--- a/utils/lockd/lockd.c
+++ b/utils/lockd/lockd.c
@@ -9,6 +9,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include "nfslib.h"
 
 static void	usage(const char *);
@@ -21,8 +22,14 @@ main(int argc, char **argv)
 	if (argc > 1)
 		usage (argv [0]);
 
-	if ((error = lockdsvc()) < 0)
-		perror("lockdsvc");
+	if ((error = lockdsvc()) < 0) {
+		if (errno == EINVAL)
+			/* Ignore EINVAL since kernel may start
+			   lockd automatically. */
+			error = 0;
+		else
+			perror("lockdsvc");
+	}
 
 	return (error != 0);
 }