From ec3045dcf2f59e6c63a0350a503167ba21a04047 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 10 Jul 2009 10:39:44 -0700
Subject: [PATCH] Refine HAVE_ZPL checks after b117 update.

---
 module/zfs/zfs_ioctl.c  | 6 ++----
 module/zfs/zfs_vfsops.c | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 5212dae3f7..70b90ba021 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3349,10 +3349,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;
@@ -3367,10 +3367,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.