diff options
| author | trasz <trasz@FreeBSD.org> | 2008-11-25 23:05:46 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2008-11-25 23:05:46 +0000 |
| commit | d6453c69d2e055205ffd07e3cb6b3370a99f3b82 (patch) | |
| tree | ac76b2b0fb89a4a79e7d0cafd9fa3a4312da1c6b /sys/cddl/contrib | |
| parent | 3a81cef6021b338d184e794524300696e9158123 (diff) | |
| download | FreeBSD-src-d6453c69d2e055205ffd07e3cb6b3370a99f3b82.zip FreeBSD-src-d6453c69d2e055205ffd07e3cb6b3370a99f3b82.tar.gz | |
MFp4: We don't support TX_CREATE_ACL_ATTR nor TX_MKDIR_ACL_ATTR; code found
in zfs_replay.c will panic if it encounters transactions of this type.
Make sure we don't put these into the ZIL.
Approved by: rwatson (mentor), pjd
Diffstat (limited to 'sys/cddl/contrib')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c index 5f99780..180196b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c @@ -60,7 +60,11 @@ zfs_log_create_txtype(zil_create_t type, vsecattr_t *vsecp, vattr_t *vap) if (vsecp == NULL && !isxvattr) return (TX_CREATE); if (vsecp && isxvattr) +#ifdef TODO return (TX_CREATE_ACL_ATTR); +#else + panic("%s:%u: unsupported condition", __func__, __LINE__); +#endif if (vsecp) return (TX_CREATE_ACL); else @@ -70,7 +74,11 @@ zfs_log_create_txtype(zil_create_t type, vsecattr_t *vsecp, vattr_t *vap) if (vsecp == NULL && !isxvattr) return (TX_MKDIR); if (vsecp && isxvattr) +#ifdef TODO return (TX_MKDIR_ACL_ATTR); +#else + panic("%s:%u: unsupported condition", __func__, __LINE__); +#endif if (vsecp) return (TX_MKDIR_ACL); else |
