From owner-p4-projects@FreeBSD.ORG  Wed Nov 19 10:39:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 10BFC1065675; Wed, 19 Nov 2008 10:39:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C905C1065672
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 10:39:06 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B45D58FC12
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 10:39:06 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAJAd6pb080402
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 10:39:06 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAJAd60j080400
	for perforce@freebsd.org; Wed, 19 Nov 2008 10:39:06 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 19 Nov 2008 10:39:06 GMT
Message-Id: <200811191039.mAJAd60j080400@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153207 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2008 10:39:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=153207

Change 153207 by trasz@trasz_victim7 on 2008/11/19 10:38:23

	Rollback change 153169; it doesn't compile.  Big XXX here - if I'm
	reading this correctly, it will panic during replay if the system crashes
	in the wrong moment with ACLs enabled.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#6 (text+ko) ====

@@ -347,8 +347,12 @@
 			    lr->lr_uid, lr->lr_gid);
 		}
 
+#ifdef TODO
 		error = VOP_CREATE(ZTOV(dzp), name, &xva.xva_vattr,
 		    0, 0, &vp, kcred, vflg, NULL, &vsec);
+#else
+		panic("%s:%u: unsupported condition", __func__, __LINE__);
+#endif
 		break;
 	case TX_MKDIR_ACL:
 		aclstart = (caddr_t)(lracl + 1);
@@ -377,8 +381,12 @@
 			    (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt,
 			    lr->lr_uid, lr->lr_gid);
 		}
+#ifdef TODO
 		error = VOP_MKDIR(ZTOV(dzp), name, &xva.xva_vattr,
 		    &vp, kcred, NULL, vflg, &vsec);
+#else
+		panic("%s:%u: unsupported condition", __func__, __LINE__);
+#endif
 		break;
 	default:
 		error = ENOTSUP;
@@ -823,7 +831,11 @@
 	vsa.vsa_aclflags = 0;
 	vsa.vsa_aclentp = ace;
 
+#ifdef TODO
 	error = VOP_SETSECATTR(ZTOV(zp), &vsa, 0, kcred, NULL);
+#else
+	panic("%s:%u: unsupported condition", __func__, __LINE__);
+#endif
 
 	VN_RELE(ZTOV(zp));
 
@@ -873,6 +885,7 @@
 		return (error);
 	}
 
+#ifdef TODO
 	bzero(&vsa, sizeof (vsa));
 	vsa.vsa_mask = VSA_ACE | VSA_ACECNT | VSA_ACE_ACLFLAGS;
 	vsa.vsa_aclcnt = lr->lr_aclcnt;
@@ -893,6 +906,9 @@
 
 	if (zfsvfs->z_fuid_replay)
 		zfs_fuid_info_free(zfsvfs->z_fuid_replay);
+#else
+	error = EOPNOTSUPP;
+#endif
 
 	zfsvfs->z_fuid_replay = NULL;
 	VN_RELE(ZTOV(zp));