From owner-svn-src-user@FreeBSD.ORG Tue Jul 23 16:11:27 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 77CF819B; Tue, 23 Jul 2013 16:11:27 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 503CD276E; Tue, 23 Jul 2013 16:11:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6NGBRK0073014; Tue, 23 Jul 2013 16:11:27 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6NGBQCA073012; Tue, 23 Jul 2013 16:11:26 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201307231611.r6NGBQCA073012@svn.freebsd.org> From: Attilio Rao Date: Tue, 23 Jul 2013 16:11:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253578 - in user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris: kern sys X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jul 2013 16:11:27 -0000 Author: attilio Date: Tue Jul 23 16:11:26 2013 New Revision: 253578 URL: http://svnweb.freebsd.org/changeset/base/253578 Log: Fix style and sorting. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/sys/vm.h Modified: user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c ============================================================================== --- user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c Tue Jul 23 16:08:23 2013 (r253577) +++ user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c Tue Jul 23 16:11:26 2013 (r253578) @@ -41,42 +41,36 @@ const int zfs_vm_pagerret_bad = VM_PAGER const int zfs_vm_pagerret_error = VM_PAGER_ERROR; const int zfs_vm_pagerret_ok = VM_PAGER_OK; +/* + * For assertions skipping FILE/LINE will not be too helpful, but + * they must be hard functions for compatibility reasons. + */ void zfs_vmobject_assert_locked(vm_object_t object) { - /* - * This is not ideal because FILE/LINE used by assertions will not - * be too helpful, but it must be an hard function for - * compatibility reasons. - */ VM_OBJECT_ASSERT_LOCKED(object); } void -zfs_vmobject_rlock(vm_object_t object) +zfs_vmobject_assert_wlocked(vm_object_t object) { - VM_OBJECT_RLOCK(object); + VM_OBJECT_ASSERT_WLOCKED(object); } void -zfs_vmobject_runlock(vm_object_t object) +zfs_vmobject_rlock(vm_object_t object) { - VM_OBJECT_RUNLOCK(object); + VM_OBJECT_RLOCK(object); } void -zfs_vmobject_assert_wlocked(vm_object_t object) +zfs_vmobject_runlock(vm_object_t object) { - /* - * This is not ideal because FILE/LINE used by assertions will not - * be too helpful, but it must be an hard function for - * compatibility reasons. - */ - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_RUNLOCK(object); } void Modified: user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/sys/vm.h ============================================================================== --- user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/sys/vm.h Tue Jul 23 16:08:23 2013 (r253577) +++ user/attilio/vmobj-fullread/sys/cddl/compat/opensolaris/sys/vm.h Tue Jul 23 16:11:26 2013 (r253578) @@ -36,9 +36,9 @@ extern const int zfs_vm_pagerret_error; extern const int zfs_vm_pagerret_ok; void zfs_vmobject_assert_locked(vm_object_t object); +void zfs_vmobject_assert_wlocked(vm_object_t object); void zfs_vmobject_rlock(vm_object_t object); void zfs_vmobject_runlock(vm_object_t object); -void zfs_vmobject_assert_wlocked(vm_object_t object); void zfs_vmobject_wlock(vm_object_t object); void zfs_vmobject_wunlock(vm_object_t object);