Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 23 Feb 2013 15:50:28 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r247191 - in user/attilio/vmobj-rwlock/sys/cddl: compat/opensolaris/kern compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs
Message-ID:  <201302231550.r1NFoSJq054927@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: attilio
Date: Sat Feb 23 15:50:28 2013
New Revision: 247191
URL: http://svnweb.freebsd.org/changeset/base/247191

Log:
  Change the use of hard functions for vm_pager_ok and switch to
  const variables.
  
  Sponsored by:	EMC / Isilon storage division
  Reported by:	pjd

Modified:
  user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
  user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/sys/vm.h
  user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
==============================================================================
--- user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c	Sat Feb 23 15:15:41 2013	(r247190)
+++ user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c	Sat Feb 23 15:50:28 2013	(r247191)
@@ -36,26 +36,9 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
-int
-vm_pagerret_bad(void)
-{
-
-	return (VM_PAGER_BAD);
-}
-
-int
-vm_pagerret_error(void)
-{
-
-	return (VM_PAGER_ERROR);
-}
-
-int
-vm_pagerret_ok(void)
-{
-
-	return (VM_PAGER_OK);
-}
+const int zfs_vm_pagerret_bad = VM_PAGER_BAD;
+const int zfs_vm_pagerret_error = VM_PAGER_ERROR;
+const int zfs_vm_pagerret_ok = VM_PAGER_OK;
 
 void
 zfs_vmobject_assert_wlocked(vm_object_t object)

Modified: user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/sys/vm.h
==============================================================================
--- user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/sys/vm.h	Sat Feb 23 15:15:41 2013	(r247190)
+++ user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/sys/vm.h	Sat Feb 23 15:50:28 2013	(r247191)
@@ -31,9 +31,9 @@
 
 #ifdef _KERNEL
 
-int	vm_pagerret_bad(void);
-int	vm_pagerret_error(void);
-int	vm_pagerret_ok(void);
+extern const int zfs_vm_pagerret_bad;
+extern const int zfs_vm_pagerret_error;
+extern const int zfs_vm_pagerret_ok;
 
 void	zfs_vmobject_assert_wlocked(vm_object_t object);
 void	zfs_vmobject_wlock(vm_object_t object);

Modified: user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Feb 23 15:15:41 2013	(r247190)
+++ user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Feb 23 15:50:28 2013	(r247191)
@@ -5702,7 +5702,7 @@ zfs_getpages(struct vnode *vp, vm_page_t
 			vm_page_zero_invalid(mreq, TRUE);
 		zfs_vmobject_wunlock(object);
 		ZFS_EXIT(zfsvfs);
-		return (vm_pagerret_ok());
+		return (zfs_vm_pagerret_ok);
 	}
 
 	PCPU_INC(cnt.v_vnodein);
@@ -5718,7 +5718,7 @@ zfs_getpages(struct vnode *vp, vm_page_t
 		}
 		zfs_vmobject_wunlock(object);
 		ZFS_EXIT(zfsvfs);
-		return (vm_pagerret_bad());
+		return (zfs_vm_pagerret_bad);
 	}
 
 	lsize = PAGE_SIZE;
@@ -5755,7 +5755,7 @@ zfs_getpages(struct vnode *vp, vm_page_t
 
 	ZFS_ACCESSTIME_STAMP(zfsvfs, zp);
 	ZFS_EXIT(zfsvfs);
-	return (error ? vm_pagerret_error() : vm_pagerret_ok());
+	return (error ? zfs_vm_pagerret_error : zfs_vm_pagerret_ok);
 }
 
 static int

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302231550.r1NFoSJq054927>