diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
| commit | e2f9756b8e9461119d4c8b16701e32425283b31a (patch) | |
| tree | 589339198ca8b38dd8280d8664e06d72bca3d83a /usr/src/man/man5/zpool-features.5 | |
| parent | d2ea917c8c4786e6dce9d0fd7f18c55c9f72f16e (diff) | |
| parent | 8b36997aa24d9817807faa4efa301ac9c07a2b78 (diff) | |
| download | illumos-joyent-release-20131212.tar.gz | |
[illumos-gate merge]20131212release-20131212
commit 8b36997aa24d9817807faa4efa301ac9c07a2b78
4391 panic system rather than corrupting pool if we hit bug 4390
commit 78f171005391b928aaf1642b3206c534ed644332
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
commit 973c78e94bf9634782164382c9e291bf81161fa5
4121 vdev_label_init should treat request as succeeded when pool is read only
Conflicts:
usr/src/man/man1m/zfs.1m
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/cmd/zfs/zfs_main.c
Diffstat (limited to 'usr/src/man/man5/zpool-features.5')
| -rw-r--r-- | usr/src/man/man5/zpool-features.5 | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index 4df496d0ad..58ec7ab7dc 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -224,11 +224,11 @@ When the \fBlz4_compress\fR feature is set to \fBenabled\fR, the administrator can turn on \fBlz4\fR compression on any dataset on the pool using the \fBzfs\fR(1M) command. Please note that doing so will immediately activate the \fBlz4_compress\fR feature on the underlying -pool (even before any data is written). Since this feature is not -read-only compatible, this operation will render the pool unimportable -on systems without support for the \fBlz4_compress\fR feature. At the -moment, this operation cannot be reversed. Booting off of -\fBlz4\fR-compressed root pools is supported. +pool (even before any data is written), and the feature will not be +deactivated. Since this feature is not read-only compatible, this +operation will render the pool unimportable on systems without support +for the \fBlz4_compress\fR feature. Booting off of \fBlz4\fR-compressed +root pools is supported. .RE .sp @@ -298,6 +298,27 @@ this feature are destroyed. .sp .ne 2 .na +\fB\fBbookmarks\fR\fR +.ad +.RS 4n +.TS +l l . +GUID com.delphix:bookmarks +READ\-ONLY COMPATIBLE yes +DEPENDENCIES extensible_dataset +.TE + +This feature enables use of the \fBzfs bookmark\fR subcommand. + +This feature is \fBactive\fR while any bookmarks exist in the pool. +All bookmarks in the pool can be listed by running +\fBzfs list -t bookmark -r \fIpoolname\fR\fR. + +.RE + +.sp +.ne 2 +.na \fB\fBenabled_txg\fR\fR .ad .RS 4n |