From cc61ab2f133566dca51970d44cc49a4355039b5d Mon Sep 17 00:00:00 2001 From: mm Date: Mon, 11 Jun 2012 11:35:22 +0000 Subject: Introduce "feature flags" for ZFS pools (bump SPA version to 5000). Add first feature "com.delphix:async_destroy" (asynchronous destroy of ZFS datasets). Implement features support in ZFS boot code. Illumos revisions merged: 13700:2889e2596bd6 13701:1949b688d5fb 2619 asynchronous destruction of ZFS file systems 2747 SPA versioning with zfs feature flags References: https://www.illumos.org/issues/2619 https://www.illumos.org/issues/2747 Obtained from: illumos (issue #2619, #2747) MFC after: 1 month --- cddl/lib/libnvpair/Makefile | 7 ++++++- cddl/lib/libzfs/Makefile | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'cddl/lib') diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index da0c7f3..bd159fc 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -8,12 +8,17 @@ LIB= nvpair SRCS= libnvpair.c \ nvpair_alloc_system.c \ nvpair_alloc_fixed.c \ - nvpair.c + nvpair.c \ + fnvpair.c WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index c1dac50..3690203 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -27,6 +27,7 @@ SRCS+= libzfs_changelist.c \ libzfs_sendrecv.c \ libzfs_status.c \ libzfs_util.c \ + zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ -- cgit v1.1