From owner-svn-src-all@FreeBSD.ORG Fri May 29 09:40:57 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 C316C1065740; Fri, 29 May 2009 09:40:57 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9714B8FC0C; Fri, 29 May 2009 09:40:57 +0000 (UTC) (envelope-from rwatson@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 n4T9ev9V066249; Fri, 29 May 2009 09:40:57 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4T9evT1066248; Fri, 29 May 2009 09:40:57 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200905290940.n4T9evT1066248@svn.freebsd.org> From: Robert Watson Date: Fri, 29 May 2009 09:40:57 +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: r193026 - head/sys/sys 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: Fri, 29 May 2009 09:40:58 -0000 Author: rwatson Date: Fri May 29 09:40:57 2009 New Revision: 193026 URL: http://svn.freebsd.org/changeset/base/193026 Log: Reduce vertical whitespace and other minor style tweaks. Remove unused rm_initialized() macro. Modified: head/sys/sys/rmlock.h Modified: head/sys/sys/rmlock.h ============================================================================== --- head/sys/sys/rmlock.h Fri May 29 08:01:48 2009 (r193025) +++ head/sys/sys/rmlock.h Fri May 29 09:40:57 2009 (r193026) @@ -33,26 +33,22 @@ #define _SYS_RMLOCK_H_ #include - #include #include #ifdef _KERNEL - void rm_init(struct rmlock *rm, const char *name, int opts); void rm_destroy(struct rmlock *rm); int rm_wowned(struct rmlock *rm); void rm_sysinit(void *arg); - void _rm_wlock_debug(struct rmlock *rm, const char *file, int line); void _rm_wunlock_debug(struct rmlock *rm, const char *file, int line); void _rm_rlock_debug(struct rmlock *rm, struct rm_priotracker *tracker, - const char *file, int line); + const char *file, int line); void _rm_runlock_debug(struct rmlock *rm, struct rm_priotracker *tracker, - const char *file, int line); - + const char *file, int line); void _rm_wlock(struct rmlock *rm); void _rm_wunlock(struct rmlock *rm); @@ -61,33 +57,25 @@ void _rm_runlock(struct rmlock *rm, str /* * Public interface for lock operations. - * */ - #ifndef LOCK_DEBUG #error LOCK_DEBUG not defined, include before #endif #if LOCK_DEBUG > 0 - #define rm_wlock(rm) _rm_wlock_debug((rm), LOCK_FILE, LOCK_LINE) #define rm_wunlock(rm) _rm_wunlock_debug((rm), LOCK_FILE, LOCK_LINE) #define rm_rlock(rm,tracker) \ _rm_rlock_debug((rm),(tracker), LOCK_FILE, LOCK_LINE ) #define rm_runlock(rm,tracker) \ _rm_runlock_debug((rm), (tracker), LOCK_FILE, LOCK_LINE ) - #else - #define rm_wlock(rm) _rm_wlock((rm)) #define rm_wunlock(rm) _rm_wunlock((rm)) #define rm_rlock(rm,tracker) _rm_rlock((rm),(tracker)) #define rm_runlock(rm,tracker) _rm_runlock((rm), (tracker)) - #endif -#define rm_initialized(rm) lock_initalized(&(rm)->lock_object) - struct rm_args { struct rmlock *ra_rm; const char *ra_desc; @@ -105,6 +93,5 @@ struct rm_args { SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ rm_destroy, (rm)) - #endif /* _KERNEL */ #endif /* !_SYS_RMLOCK_H_ */