diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 8e23aecc2c..6ad8ef4523 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3369,10 +3369,10 @@ ace_t full_access[] = {
 /*
  * Remove all ACL files in shares dir
  */
+#ifdef HAVE_ZPL
 static int
 zfs_smb_acl_purge(znode_t *dzp)
 {
-#ifdef HAVE_ZPL
 	zap_cursor_t	zc;
 	zap_attribute_t	zap;
 	zfsvfs_t *zfsvfs = dzp->z_zfsvfs;
@@ -3387,10 +3387,8 @@ zfs_smb_acl_purge(znode_t *dzp)
 	}
 	zap_cursor_fini(&zc);
 	return (error);
-#else
-	return (ENOTSUP);
-#endif /* HAVE ZPL */
 }
+#endif /* HAVE ZPL */
 
 static int
 zfs_ioc_smb_acl(zfs_cmd_t *zc)
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index 48f64ef93e..4b94411d2c 100644
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -1999,6 +1999,7 @@ zfs_busy(void)
 #endif /* HAVE_ZPL */
 }
 
+#ifdef HAVE_ZPL
 int
 zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
 {
@@ -2041,6 +2042,7 @@ zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
 
 	return (0);
 }
+#endif /* HAVE_ZPL */
 
 /*
  * Read a property stored within the master node.
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index e2455700d6..3cf22dd85b 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -1517,7 +1517,7 @@ static void
 zio_write_gang_member_ready(zio_t *zio)
 {
 	zio_t *pio = zio_unique_parent(zio);
-	ASSERTV(zio_t *gio = zio->io_gang_leader);
+	ASSERTV(zio_t *gio = zio->io_gang_leader;)
 	dva_t *cdva = zio->io_bp->blk_dva;
 	dva_t *pdva = pio->io_bp->blk_dva;
 	uint64_t asize;