Index: opensolaris/uts/common/fs/zfs/zfs_acl.c
===================================================================
--- opensolaris/uts/common/fs/zfs/zfs_acl.c	(revision 185510)
+++ opensolaris/uts/common/fs/zfs/zfs_acl.c	(working copy)
@@ -1909,7 +1909,6 @@
 		zfs_acl_free(aclp);
 }
 
-#ifdef TODO
 /*
  * Retrieve a files ACL
  */
@@ -2005,7 +2004,6 @@
 
 	return (0);
 }
-#endif	/* TODO */
 
 int
 zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_t obj_type,
@@ -2062,7 +2060,6 @@
 	return (0);
 }
 
-#ifdef TODO
 /*
  * Set a files ACL
  */
@@ -2170,7 +2167,6 @@
 
 	return (error);
 }
-#endif	/* TODO */
 
 /*
  * working_mode returns the permissions that were not granted
Index: opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
===================================================================
--- opensolaris/uts/common/fs/zfs/sys/zfs_acl.h	(revision 185510)
+++ opensolaris/uts/common/fs/zfs/sys/zfs_acl.h	(working copy)
@@ -188,10 +188,8 @@
 #ifdef _KERNEL
 void zfs_perm_init(struct znode *, struct znode *, int, vattr_t *,
     dmu_tx_t *, cred_t *, zfs_acl_t *, zfs_fuid_info_t **);
-#ifdef TODO
 int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
 int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
-#endif
 void zfs_acl_rele(void *);
 void zfs_oldace_byteswap(ace_t *, int);
 void zfs_ace_byteswap(void *, size_t, boolean_t);