From owner-svn-src-head@freebsd.org Sun Nov 15 12:50:16 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97E7BA27686; Sun, 15 Nov 2015 12:50:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A1AC1340; Sun, 15 Nov 2015 12:50:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFCoFDc045050; Sun, 15 Nov 2015 12:50:15 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFCoF6F045046; Sun, 15 Nov 2015 12:50:15 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201511151250.tAFCoF6F045046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 15 Nov 2015 12:50:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290861 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 12:50:16 -0000 Author: trasz Date: Sun Nov 15 12:50:14 2015 New Revision: 290861 URL: https://svnweb.freebsd.org/changeset/base/290861 Log: Doh, commit in a wrong directory. Fix r290857. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/sys/jail.h head/sys/sys/loginclass.h head/sys/sys/resourcevar.h Modified: head/sys/sys/jail.h ============================================================================== --- head/sys/sys/jail.h Sun Nov 15 12:48:42 2015 (r290860) +++ head/sys/sys/jail.h Sun Nov 15 12:50:14 2015 (r290861) @@ -405,7 +405,8 @@ char *prison_name(struct prison *, struc int prison_priv_check(struct ucred *cred, int priv); int sysctl_jail_param(SYSCTL_HANDLER_ARGS); void prison_racct_foreach(void (*callback)(struct racct *racct, - void *arg2, void *arg3), void *arg2, void *arg3); + void *arg2, void *arg3), void (*pre)(void), void (*post)(void), + void *arg2, void *arg3); struct prison_racct *prison_racct_find(const char *name); void prison_racct_hold(struct prison_racct *prr); void prison_racct_free(struct prison_racct *prr); Modified: head/sys/sys/loginclass.h ============================================================================== --- head/sys/sys/loginclass.h Sun Nov 15 12:48:42 2015 (r290860) +++ head/sys/sys/loginclass.h Sun Nov 15 12:50:14 2015 (r290861) @@ -48,6 +48,7 @@ void loginclass_hold(struct loginclass * void loginclass_free(struct loginclass *lc); struct loginclass *loginclass_find(const char *name); void loginclass_racct_foreach(void (*callback)(struct racct *racct, - void *arg2, void *arg3), void *arg2, void *arg3); + void *arg2, void *arg3), void (*pre)(void), void (*post)(void), + void *arg2, void *arg3); #endif /* !_SYS_LOGINCLASS_H_ */ Modified: head/sys/sys/resourcevar.h ============================================================================== --- head/sys/sys/resourcevar.h Sun Nov 15 12:48:42 2015 (r290860) +++ head/sys/sys/resourcevar.h Sun Nov 15 12:50:14 2015 (r290861) @@ -156,7 +156,8 @@ void uihashinit(void); void uihold(struct uidinfo *uip); #ifdef RACCT void ui_racct_foreach(void (*callback)(struct racct *racct, - void *arg2, void *arg3), void *arg2, void *arg3); + void *arg2, void *arg3), void (*pre)(void), void (*post)(void), + void *arg2, void *arg3); #endif #endif /* _KERNEL */