r4037 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-04-27 17:01:20 +0200 (Mon, 27 Apr 2009)
New Revision: 4037

Modified:
   trunk/varnish-cache/bin/varnishd/shmlog.c
Log:
Don't complain if we cannot mlock(2) the shmlog, it is to be expected
with priv-sep.



Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-27 10:32:23 UTC (rev 4036)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-27 15:01:20 UTC (rev 4037)
@@ -375,10 +375,7 @@
 	    MAP_HASSEMAPHORE | MAP_NOSYNC | MAP_SHARED,
 	    heritage.vsl_fd, 0);
 	xxxassert(loghead != MAP_FAILED);
-	i = mlock(loghead, heritage.vsl_size);
-	if (i != 0)
-		fprintf(stderr, "Notice: locking SHMFILE in core failed: %s\n",
-		    strerror(errno));
+	(void)mlock(loghead, heritage.vsl_size);
 	VSL_stats = &loghead->stats;
 	pp = (void *)(loghead + 1);
 	*pp = *params;