From owner-svn-src-stable@FreeBSD.ORG Tue Mar 2 10:32:34 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7254106564A; Tue, 2 Mar 2010 10:32:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 959E48FC18; Tue, 2 Mar 2010 10:32:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22AWY1n099377; Tue, 2 Mar 2010 10:32:34 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22AWYO6099375; Tue, 2 Mar 2010 10:32:34 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201003021032.o22AWYO6099375@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 2 Mar 2010 10:32:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204572 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 10:32:34 -0000 Author: kib Date: Tue Mar 2 10:32:34 2010 New Revision: 204572 URL: http://svn.freebsd.org/changeset/base/204572 Log: MFC r204412: Fix several style issues. Define make_dev_credv() as static to match declaration. Modified: stable/8/sys/kern/kern_conf.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet/ (props changed) Modified: stable/8/sys/kern/kern_conf.c ============================================================================== --- stable/8/sys/kern/kern_conf.c Tue Mar 2 10:12:17 2010 (r204571) +++ stable/8/sys/kern/kern_conf.c Tue Mar 2 10:32:34 2010 (r204572) @@ -655,7 +655,7 @@ prep_cdevsw(struct cdevsw *devsw) cdevsw_free_devlocked(dsw2); } -struct cdev * +static struct cdev * make_dev_credv(int flags, struct cdevsw *devsw, int unit, struct ucred *cr, uid_t uid, gid_t gid, int mode, const char *fmt, va_list ap) @@ -953,7 +953,8 @@ clone_setup(struct clonedevs **cdp) } int -clone_create(struct clonedevs **cdp, struct cdevsw *csw, int *up, struct cdev **dp, int extra) +clone_create(struct clonedevs **cdp, struct cdevsw *csw, int *up, + struct cdev **dp, int extra) { struct clonedevs *cd; struct cdev *dev, *ndev, *dl, *de; @@ -1124,6 +1125,7 @@ destroy_dev_sched_cbl(struct cdev *dev, int destroy_dev_sched_cb(struct cdev *dev, void (*cb)(void *), void *arg) { + dev_lock(); return (destroy_dev_sched_cbl(dev, cb, arg)); } @@ -1131,6 +1133,7 @@ destroy_dev_sched_cb(struct cdev *dev, v int destroy_dev_sched(struct cdev *dev) { + return (destroy_dev_sched_cb(dev, NULL, NULL)); }