Refine HAVE_ZPL checks after b117 update.

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)

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.