From owner-svn-src-head@freebsd.org Sun Nov 8 18:11:26 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 5A89FA29F1C; Sun, 8 Nov 2015 18:11:26 +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 2092F1259; Sun, 8 Nov 2015 18:11:26 +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 tA8IBPmQ050340; Sun, 8 Nov 2015 18:11:25 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA8IBP1s050339; Sun, 8 Nov 2015 18:11:25 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201511081811.tA8IBP1s050339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 8 Nov 2015 18:11:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290552 - head/sys/kern 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, 08 Nov 2015 18:11:26 -0000 Author: trasz Date: Sun Nov 8 18:11:24 2015 New Revision: 290552 URL: https://svnweb.freebsd.org/changeset/base/290552 Log: Make naming more consistent; no functional changes. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_rctl.c Modified: head/sys/kern/kern_rctl.c ============================================================================== --- head/sys/kern/kern_rctl.c Sun Nov 8 18:08:31 2015 (r290551) +++ head/sys/kern/kern_rctl.c Sun Nov 8 18:11:24 2015 (r290552) @@ -71,13 +71,13 @@ FEATURE(rctl, "Resource Limits"); #define HRF_DONT_INHERIT 1 #define HRF_DONT_ACCUMULATE 2 -#define RCTL_MAX_INBUFLEN 4 * 1024 -#define RCTL_MAX_OUTBUFLEN 16 * 1024 * 1024 +#define RCTL_MAX_INBUFSIZE 4 * 1024 +#define RCTL_MAX_OUTBUFSIZE 16 * 1024 * 1024 #define RCTL_LOG_BUFSIZE 128 #define RCTL_PCPU_SHIFT (10 * 1000000) -unsigned int rctl_maxbufsize = RCTL_MAX_OUTBUFLEN; +unsigned int rctl_maxbufsize = RCTL_MAX_OUTBUFSIZE; SYSCTL_NODE(_kern_racct, OID_AUTO, rctl, CTLFLAG_RW, 0, "Resource Limits"); SYSCTL_UINT(_kern_racct_rctl, OID_AUTO, maxbufsize, CTLFLAG_RWTUN, @@ -1278,7 +1278,7 @@ rctl_read_inbuf(char **inputstr, const c if (inbuflen <= 0) return (EINVAL); - if (inbuflen > RCTL_MAX_INBUFLEN) + if (inbuflen > RCTL_MAX_INBUFSIZE) return (E2BIG); str = malloc(inbuflen + 1, M_RCTL, M_WAITOK);