svn commit: r301699 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Garrett Cooper]

Author: ngie
Date: Wed Jun  8 22:28:57 2016
New Revision: 301699
URL: https://svnweb.freebsd.org/changeset/base/301699

Log:
  MFstable/10 r301695:
  
  MFC r300870,r300884:
  
  r300870:
  
  Unbreak the zfs(4) build
  
  vm/vm_pageout.h grew a dependency on the bool typedef in r300865
  
  arc.c didn't include sys/types.h, which included the definition for the typedef
  
  Other items (ofed, drm2) might need to be chased for this commit.
  
  Pointyhat to: alc
  
  r300884:
  
  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
  
  In collaboration with: kib

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Jun  8 21:38:51 2016	(r301698)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Jun  8 22:28:57 2016	(r301699)
@@ -137,7 +137,6 @@
 #include <zfs_fletcher.h>
 #include <sys/sdt.h>
 
-#include <vm/vm_pageout.h>
 
 #ifdef illumos
 #ifndef _KERNEL

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Jun  8 21:38:51 2016	(r301698)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Jun  8 22:28:57 2016	(r301699)
@@ -72,7 +72,6 @@
 #include <sys/buf.h>
 #include <sys/sched.h>
 #include <sys/acl.h>
-#include <vm/vm_pageout.h>
 
 /*
  * Programming rules.