Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

module/zfs/Makefile.in

@@ -79,7 +79,7 @@ ${MODULE}-objs += zfs_fuid.o
 # ${MODULE}-objs += zfs_rlock.o
 # ${MODULE}-objs += zfs_vfsops.o
 # ${MODULE}-objs += zfs_vnops.o
-${MODULE}-objs += zfs_znode.o
+# ${MODULE}-objs += zfs_znode.o
 ${MODULE}-objs += zil.o
 ${MODULE}-objs += zio.o
 ${MODULE}-objs += zio_checksum.o

module/zfs/include/sys/zfs_znode.h

@@ -341,8 +341,10 @@ extern void zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,
 extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap);
 extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx);
 
+#if defined(HAVE_UIO_RW)
 extern caddr_t zfs_map_page(page_t *, enum seg_rw);
 extern void zfs_unmap_page(page_t *, caddr_t);
+#endif /* HAVE_UIO_RW */
 
 extern zil_get_data_t zfs_get_data;
 extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE];

module/zfs/zfs_vnops.c

@@ -317,6 +317,7 @@ zfs_ioctl(vnode_t *vp, int com, intptr_t data, int flag, cred_t *cred,
 	return (ENOTTY);
 }
 
+#if defined(_KERNEL) && defined(HAVE_UIO_RW)
 /*
  * Utility functions to map and unmap a single physical page.  These
  * are used to manage the mappable copies of ZFS file data, and therefore
@@ -341,6 +342,7 @@ zfs_unmap_page(page_t *pp, caddr_t addr)
 		ppmapout(addr);
 	}
 }
+#endif /* _KERNEL && HAVE_UIO_RW */
 
 /*
  * When a file is memory mapped, we must keep the IO data synchronized