diff options
| author | mm <mm@FreeBSD.org> | 2012-08-28 12:25:37 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-08-28 12:25:37 +0000 |
| commit | d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8 (patch) | |
| tree | de7860b2979788424d3d99e83f3eac4757202a08 /sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h | |
| parent | dc45fbdfb7bda54267530493482e960f5a622636 (diff) | |
| download | FreeBSD-src-d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8.zip FreeBSD-src-d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8.tar.gz | |
Merge recent vendor changes:
3100 zvol rename fails with EBUSY when dirty
3104 eliminate empty bpobjs
3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc
References:
https://www.illumos.org/issues/3100
https://www.illumos.org/issues/3104
https://www.illumos.org/issues/3120
Obtained from: illumos (vendor/illumos, vendor/illumos-sys)
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h index b57eb43..cb786b2 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h @@ -50,6 +50,7 @@ typedef int (zfeature_func_t)(zfeature_info_t *fi, void *arg); static enum spa_feature { SPA_FEATURE_ASYNC_DESTROY, + SPA_FEATURE_EMPTY_BPOBJ, SPA_FEATURES } spa_feature_t; |
