Date: Tue, 23 Jul 2013 16:11:26 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> 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 Message-ID: <201307231611.r6NGBQCA073012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307231611.r6NGBQCA073012>