Date: Wed, 19 Nov 2008 10:39:06 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153207 for review Message-ID: <200811191039.mAJAd60j080400@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811191039.mAJAd60j080400>