From owner-svn-src-projects@FreeBSD.ORG  Sun Mar 17 17:13:44 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3899E83B;
 Sun, 17 Mar 2013 17:13:44 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 134D0A30;
 Sun, 17 Mar 2013 17:13:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HHDhR4079785;
 Sun, 17 Mar 2013 17:13:43 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HHDhl0079783;
 Sun, 17 Mar 2013 17:13:43 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201303171713.r2HHDhl0079783@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 17 Mar 2013 17:13:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248432 - in projects/counters/sys: kern sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Mar 2013 17:13:44 -0000

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,					\