--- a/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c	Thu May 25 00:15:01 2006 -0700
+++ b/usr/src/uts/common/fs/nfs/nfs4_srv_attr.c	Thu May 25 02:58:46 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -1631,7 +1630,7 @@
 		ASSERT(sarg->cs->vp != NULL);
 		error = VOP_PATHCONF(sarg->cs->vp, _PC_LINK_MAX, &val,
 				sarg->cs->cr);
-		if (!error && (na->maxlink != val))
+		if (!error && (na->maxlink != (uint32_t)val))
 			error = -1;	/* no match */
 		break;
 	case NFS4ATTR_FREEIT:

--- a/usr/src/uts/common/fs/nfs/nfs4_xdr.c	Thu May 25 00:15:01 2006 -0700
+++ b/usr/src/uts/common/fs/nfs/nfs4_xdr.c	Thu May 25 02:58:46 2006 -0700
@@ -4399,15 +4399,6 @@
 }
 
 static bool_t
-xdr_cnfs_resop4_wrap(XDR *xdrs, nfs_resop4 *objp)
-{
-	if (!xdr_int(xdrs, (int *)&objp->resop))
-		return (FALSE);
-
-	return (xdr_nfs_resop4(xdrs, objp));
-}
-
-static bool_t
 xdr_snfs_resop4(XDR *xdrs, nfs_resop4 *objp)
 {
 	if (!xdr_int(xdrs, (int *)&objp->resop))

--- a/usr/src/uts/common/fs/zfs/zfs_acl.c	Thu May 25 00:15:01 2006 -0700
+++ b/usr/src/uts/common/fs/zfs/zfs_acl.c	Thu May 25 02:58:46 2006 -0700
@@ -1030,7 +1030,7 @@
 		if ((vap->va_mask & AT_GID) &&
 		    ((vap->va_gid == parent->z_phys->zp_gid) ||
 		    groupmember(vap->va_gid, cr) ||
-		    secpolicy_vnode_create_gid(cr)))
+		    secpolicy_vnode_create_gid(cr) == 0))
 			gid = vap->va_gid;
 		else
 			gid = (parent->z_phys->zp_mode & S_ISGID) ?