Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Mar 2013 17:13:43 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r248432 - in projects/counters/sys: kern sys
Message-ID:  <201303171713.r2HHDhl0079783@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Sun Mar 17 17:13:43 2013
New Revision: 248432
URL: http://svnweb.freebsd.org/changeset/base/248432

Log:
  Fixes to r248420:
  - Remove a check that never fires in sysctl_handle_counter_u64()
  - Add comment above SYSCTL_COUNTER_U64()
  
  Submitted by:	jilles

Modified:
  projects/counters/sys/kern/subr_counter.c
  projects/counters/sys/sys/sysctl.h

Modified: projects/counters/sys/kern/subr_counter.c
==============================================================================
--- projects/counters/sys/kern/subr_counter.c	Sun Mar 17 16:49:37 2013	(r248431)
+++ projects/counters/sys/kern/subr_counter.c	Sun Mar 17 17:13:43 2013	(r248432)
@@ -91,9 +91,6 @@ sysctl_handle_counter_u64(SYSCTL_HANDLER
 	if (error || !req->newptr)
 		return (error);
 
-	if (!arg1)
-		return (EPERM);
-
 	/*
 	 * Any write attempt to a counter zeroes it.
 	 */

Modified: projects/counters/sys/sys/sysctl.h
==============================================================================
--- projects/counters/sys/sys/sysctl.h	Sun Mar 17 16:49:37 2013	(r248431)
+++ projects/counters/sys/sys/sysctl.h	Sun Mar 17 17:13:43 2013	(r248432)
@@ -380,6 +380,7 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
 	    SYSCTL_ADD_ASSERT_TYPE(UINT64, ptr), 0,			\
 	    sysctl_handle_64, "QU", __DESCR(descr))
 
+/* Oid for a 64-bin unsigned counter(9).  The pointer must be non NULL. */
 #define	SYSCTL_COUNTER_U64(parent, nbr, name, access, ptr, val, descr)	\
 	SYSCTL_ASSERT_TYPE(UINT64, ptr, parent, name);			\
 	SYSCTL_OID(parent, nbr, name,					\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303171713.r2HHDhl0079783>