svn commit: r300884 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Garrett Cooper]

Author: ngie
Date: Fri May 27 22:56:00 2016
New Revision: 300884
URL: https://svnweb.freebsd.org/changeset/base/300884

Log:
  Fix up r300870
  
  The sys/types.h fix I proposed was only tested with zfs(4), not with
  libzpool, which is where the build failure actually existed
  
  Remove vm/vm_pageout.h from arc.c and zfs_vnops.c because they're both
  unneeded
  
  MFC after: 1 week
  X-MFC with: r300865, r300870
  In collaboration with: kib
  Submitted by: alc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri May 27 22:44:33 2016	(r300883)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri May 27 22:56:00 2016	(r300884)
@@ -120,7 +120,6 @@
  *	- ARC header release, as it removes from L2ARC buflists
  */
 
-#include <sys/types.h>
 #include <sys/spa.h>
 #include <sys/zio.h>
 #include <sys/zio_compress.h>
@@ -141,7 +140,6 @@
 #include <zfs_fletcher.h>
 #include <sys/sdt.h>
 
-#include <vm/vm_pageout.h>
 #include <machine/vmparam.h>
 
 #ifdef illumos

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri May 27 22:44:33 2016	(r300883)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri May 27 22:56:00 2016	(r300884)
@@ -75,7 +75,6 @@
 #include <sys/sched.h>
 #include <sys/acl.h>
 #include <vm/vm_param.h>
-#include <vm/vm_pageout.h>
 
 /*
  * Programming rules.