Date: Tue, 25 Nov 2008 23:05:46 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185321 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200811252305.mAPN5ksk037503@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Tue Nov 25 23:05:46 2008 New Revision: 185321 URL: http://svn.freebsd.org/changeset/base/185321 Log: 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 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c Tue Nov 25 21:54:42 2008 (r185320) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c Tue Nov 25 23:05:46 2008 (r185321) @@ -60,7 +60,11 @@ zfs_log_create_txtype(zil_create_t type, 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, 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811252305.mAPN5ksk037503>