From owner-svn-src-all@FreeBSD.ORG Wed Apr 29 18:41:08 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E2C91065675; Wed, 29 Apr 2009 18:41:08 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63C548FC20; Wed, 29 Apr 2009 18:41:08 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3TIf8i6088077; Wed, 29 Apr 2009 18:41:08 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3TIf8c2088076; Wed, 29 Apr 2009 18:41:08 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <200904291841.n3TIf8c2088076@svn.freebsd.org> From: Jamie Gritton Date: Wed, 29 Apr 2009 18:41:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191671 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2009 18:41:09 -0000 Author: jamie Date: Wed Apr 29 18:41:08 2009 New Revision: 191671 URL: http://svn.freebsd.org/changeset/base/191671 Log: Some non-functional changes: whitespace, KASSERT strings, declaration order. Approved by: bz (mentor) Modified: head/sys/kern/kern_jail.c Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Wed Apr 29 18:08:18 2009 (r191670) +++ head/sys/kern/kern_jail.c Wed Apr 29 18:41:08 2009 (r191671) @@ -121,13 +121,13 @@ int prisoncount = 0; static void init_prison(void *); static void prison_complete(void *context, int pending); -static int sysctl_jail_list(SYSCTL_HANDLER_ARGS); #ifdef INET static int _prison_check_ip4(struct prison *pr, struct in_addr *ia); #endif #ifdef INET6 static int _prison_check_ip6(struct prison *pr, struct in6_addr *ia6); #endif +static int sysctl_jail_list(SYSCTL_HANDLER_ARGS); static void init_prison(void *data __unused) @@ -765,7 +765,7 @@ prison_hold_locked(struct prison *pr) mtx_assert(&pr->pr_mtx, MA_OWNED); KASSERT(pr->pr_ref > 0, - ("Trying to hold dead prison (id=%d).", pr->pr_id)); + ("Trying to hold dead prison (jid=%d).", pr->pr_id)); pr->pr_ref++; } @@ -784,7 +784,8 @@ prison_proc_hold(struct prison *pr) mtx_lock(&pr->pr_mtx); KASSERT(pr->pr_state == PRISON_STATE_ALIVE, - ("Cannot add a process to a non-alive prison (id=%d).", pr->pr_id)); + ("Cannot add a process to a non-alive prison (jid=%d).", + pr->pr_id)); pr->pr_nprocs++; mtx_unlock(&pr->pr_mtx); } @@ -795,7 +796,7 @@ prison_proc_free(struct prison *pr) mtx_lock(&pr->pr_mtx); KASSERT(pr->pr_state == PRISON_STATE_ALIVE && pr->pr_nprocs > 0, - ("Trying to kill a process in a dead prison (id=%d).", pr->pr_id)); + ("Trying to kill a process in a dead prison (jid=%d).", pr->pr_id)); pr->pr_nprocs--; if (pr->pr_nprocs == 0) pr->pr_state = PRISON_STATE_DYING; @@ -821,7 +822,6 @@ prison_get_ip4(struct ucred *cred, struc KASSERT(ia != NULL, ("%s: ia is NULL", __func__)); if (!jailed(cred)) - /* Do not change address passed in. */ return (0); if (cred->cr_prison->pr_ip4 == NULL) return (EAFNOSUPPORT);