Rebase fixes and cleanup

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

include/sys/Makefile.am

@@ -16,7 +16,6 @@ COMMON_H = \
 	$(top_srcdir)/include/sys/bqueue.h \
 	$(top_srcdir)/include/sys/cityhash.h \
 	$(top_srcdir)/include/sys/dataset_kstats.h \
-	$(top_srcdir)/include/sys/compress_auto.h \
 	$(top_srcdir)/include/sys/compress_adaptive.h \
 	$(top_srcdir)/include/sys/dbuf.h \
 	$(top_srcdir)/include/sys/ddt.h \

include/sys/dsl_dataset.h

@@ -484,7 +484,7 @@ boolean_t dsl_dataset_get_uint64_array_feature(dsl_dataset_t *ds,
 void dsl_dataset_activate_redaction(dsl_dataset_t *ds, uint64_t *redact_snaps,
     uint64_t num_redact_snaps, dmu_tx_t *tx);
 
-int dsl_dataset_activate_compress_auto(const char *ddname);
+
 int dsl_dataset_activate_compress_adaptive(const char *ddname);
 
 void dsl_dataset_activate_feature(uint64_t dsobj,

lib/libzpool/Makefile.am

@@ -49,7 +49,6 @@ KERNEL_C = \
 	btree.c \
 	bqueue.c \
 	cityhash.c \
-	compress_auto.c \
 	compress_adaptive.c \
 	dbuf.c \
 	dbuf_stats.c \

man/man5/zpool-features.5

@@ -641,16 +641,12 @@ giving approximately 10% better compression ratio.
 
 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(8) command. Please note that doing so will
+pool using the zfs(8) command. Please note that doing so will
 immediately activate the \fBlz4_compress\fR feature on the underlying
-pool using the \fBzfs\fR(1M) command. Also, all newly written metadata
+pool using the zfs(8) command. Also, all newly written metadata
 will be compressed with \fBlz4\fR algorithm. 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.
-
-This feature becomes \fBactive\fR as soon as it is enabled and will
-never return to being \fBenabled\fR.
+on systems without support for the \fBlz4_compress\fR feature.
 
 Booting off of \fBlz4\fR-compressed root pools is supported.
 

man/man8/zfs.8

@@ -197,64 +197,6 @@ Creates a bookmark of the given snapshot.
 Bookmarks mark the point in time when the snapshot was created, and can be used
 as the incremental source for a
 .Nm zfs Cm send
-.Sy compression Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Sy adaptive Ns | Ns Sy gzip Ns | Ns
-.Sy gzip- Ns Em N Ns | Ns Sy lz4 Ns | Ns Sy lzjb Ns | Ns Sy zle
-Controls the compression algorithm used for this dataset.
-.Pp
-Setting compression to
-.Sy on
-indicates that the current default compression algorithm should be used.
-The default balances compression and decompression speed, with compression ratio
-and is expected to work well on a wide variety of workloads.
-Unlike all other settings for this property,
-.Sy on
-does not select a fixed compression type.
-As new compression algorithms are added to ZFS and enabled on a pool, the
-default compression algorithm may change.
-The current default compression algorithm is either
-.Sy lzjb
-or, if the
-.Sy lz4_compress
-feature is enabled,
-.Sy lz4 .
-.Pp
-If compression is set to
-.Sy adaptive
-the optimal compression algorithm out of lz4 and gzip-[1-9] will be choosen based on system load and write performance of the pool's devices, to maintain optimal write speed. To use this compression mode, the
-.Sy compress_adaptive
-feature flag needs to be enabled. See
-.Xr zpool-features 5
-for details on ZFS feature flags and the
-.Sy compress_adaptive
-feature.
-.Pp
-The
-.Sy lz4
-compression algorithm is a high-performance replacement for the
-.Sy lzjb
-algorithm.
-It features significantly faster compression and decompression, as well as a
-moderately higher compression ratio than
-.Sy lzjb ,
-but can only be used on pools with the
-.Sy lz4_compress
-feature set to
-.Sy enabled .
-See
-.Xr zpool-features 5
-for details on ZFS feature flags and the
-.Sy lz4_compress
-feature.
-.Pp
-The
-.Sy lzjb
-compression algorithm is optimized for performance while providing decent data
-compression.
-.Pp
-The
-.Sy gzip
-compression algorithm uses the same compression as the
-.Xr gzip 1
 command.
 .It Xr zfs-redact 8
 Generate a new redaction bookmark.

man/man8/zfsprops.8

@@ -715,7 +715,7 @@ for more information on these algorithms.
 .Pp
 Changing this property affects only newly-written data.
 .It Xo
-.Sy compression Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Sy gzip Ns | Ns
+.Sy compression Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Sy adaptive Ns | Ns Sy gzip Ns | Ns
 .Sy gzip- Ns Em N Ns | Ns Sy lz4 Ns | Ns Sy lzjb Ns | Ns Sy zle
 .Xc
 Controls the compression algorithm used for this dataset.
@@ -731,6 +731,17 @@ does not select a fixed compression type.
 As new compression algorithms are added to ZFS and enabled on a pool, the
 default compression algorithm may change.
 The current default compression algorithm is either
+.Pp
+If compression is set to
+.Sy adaptive
+the optimal compression algorithm out of lz4 and gzip-[1-9] will be choosen based on system load and write performance of the pool's devices, to maintain optimal write speed. To use this compression mode, the
+.Sy compress_adaptive
+feature flag needs to be enabled. See
+.Xr zpool-features 5
+for details on ZFS feature flags and the
+.Sy compress_adaptive
+feature.
+.Pp
 .Sy lzjb
 or, if the
 .Sy lz4_compress

module/zfs/Makefile.in

@@ -21,7 +21,6 @@ $(MODULE)-objs += arc.o
 $(MODULE)-objs += blkptr.o
 $(MODULE)-objs += bplist.o
 $(MODULE)-objs += bpobj.o
-$(MODULE)-objs += compress_auto.o
 $(MODULE)-objs += compress_adaptive.o
 $(MODULE)-objs += bptree.o
 $(MODULE)-objs += btree.o