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

lib/libzpool/Makefile.am

@@ -85,5 +85,4 @@ libzpool_la_SOURCES = \
 	${top_srcdir}/module/zfs/zio.c \
 	${top_srcdir}/module/zfs/zio_checksum.c \
 	${top_srcdir}/module/zfs/zio_compress.c \
-	${top_srcdir}/module/zfs/zio_inject.c \
+	${top_srcdir}/module/zfs/zio_inject.c
-	${top_srcdir}/module/zfs/zvol.c

module/zfs/Makefile.in

@@ -35,7 +35,7 @@ ${MODULE}-objs += gzip.o
 ${MODULE}-objs += lzjb.o
 ${MODULE}-objs += metaslab.o
 ${MODULE}-objs += refcount.o
-# ${MODULE}-objs += rrwlock.o
+${MODULE}-objs += rrwlock.o
 ${MODULE}-objs += sha256.o
 ${MODULE}-objs += spa.o
 ${MODULE}-objs += spa_boot.o
@@ -62,16 +62,16 @@ ${MODULE}-objs += zap_leaf.o
 ${MODULE}-objs += zap_micro.o
 ${MODULE}-objs += zfs_acl.o
 ${MODULE}-objs += zfs_byteswap.o
-# ${MODULE}-objs += zfs_ctldir.o
+${MODULE}-objs += zfs_ctldir.o
-# ${MODULE}-objs += zfs_dir.o
+${MODULE}-objs += zfs_dir.o
 ${MODULE}-objs += zfs_fm.o
-# ${MODULE}-objs += zfs_fuid.o
+${MODULE}-objs += zfs_fuid.o
 ${MODULE}-objs += zfs_ioctl.o
-# ${MODULE}-objs += zfs_log.o
+${MODULE}-objs += zfs_log.o
-# ${MODULE}-objs += zfs_replay.o
+${MODULE}-objs += zfs_replay.o
-# ${MODULE}-objs += zfs_rlock.o
+${MODULE}-objs += zfs_rlock.o
 ${MODULE}-objs += zfs_vfsops.o
-# ${MODULE}-objs += zfs_vnops.o
+${MODULE}-objs += zfs_vnops.o
 ${MODULE}-objs += zfs_znode.o
 ${MODULE}-objs += zil.o
 ${MODULE}-objs += zio.o

module/zfs/zfs_ctldir.c

@@ -66,6 +66,8 @@
  * so that it cannot be freed until all snapshots have been unmounted.
  */
 
+#ifdef HAVE_ZPL
+
 #include <fs/fs_subr.h>
 #include <sys/zfs_ctldir.h>
 #include <sys/zfs_ioctl.h>
@@ -1157,3 +1159,4 @@ zfsctl_umount_snapshots(vfs_t *vfsp, int fflags, cred_t *cr)
 
 	return (error);
 }
+#endif /* HAVE_ZPL */

module/zfs/zfs_dir.c

@@ -23,6 +23,8 @@
  * Use is subject to license terms.
  */
 
+#ifdef HAVE_ZPL
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -975,3 +977,4 @@ zfs_sticky_remove_access(znode_t *zdp, znode_t *zp, cred_t *cr)
 	else
 		return (secpolicy_vnode_remove(cr));
 }
+#endif /* HAVE_ZPL */

module/zfs/zfs_log.c

@@ -23,6 +23,8 @@
  * Use is subject to license terms.
  */
 
+#ifdef HAVE_ZPL
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -692,3 +694,5 @@ zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,
 	seq = zil_itx_assign(zilog, itx, tx);
 	zp->z_last_itx = seq;
 }
+
+#endif /* HAVE_ZPL */

module/zfs/zfs_replay.c

@@ -23,6 +23,8 @@
  * Use is subject to license terms.
  */
 
+#ifdef HAVE_ZPL
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -876,3 +878,4 @@ zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE] = {
 	zfs_replay_create,	/* TX_MKDIR_ATTR */
 	zfs_replay_create_acl,	/* TX_MKDIR_ACL_ATTR */
 };
+#endif /* HAVE_ZPL */

module/zfs/zfs_rlock.c

@@ -94,6 +94,8 @@
  * range to just the range to be written using zfs_reduce_range.
  */
 
+#ifdef HAVE_ZPL
+
 #include <sys/zfs_rlock.h>
 
 /*
@@ -600,3 +602,4 @@ zfs_range_compare(const void *arg1, const void *arg2)
 		return (-1);
 	return (0);
 }
+#endif /* HAVE_ZPL */

module/zfs/zfs_vnops.c

@@ -25,6 +25,8 @@
 
 /* Portions Copyright 2007 Jeremy Teo */
 
+#ifdef HAVE_ZPL
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -4561,3 +4563,4 @@ const fs_operation_def_t zfs_evnodeops_template[] = {
 	VOPNAME_PATHCONF,	{ .vop_pathconf = zfs_pathconf },
 	NULL,			NULL
 };
+#endif /* HAVE_ZPL */