Author: delphij
Date: Fri Jul 25 06:53:20 2014
New Revision: 269086
URL: http://svnweb.freebsd.org/changeset/base/269086
Log:
As of r268075, the responsibility of rounding up buffer to optimal size have
been transferred from zio_compress_data to its caller. Therefore, passing
the 'minblocksize' down will be a no-op.
Eliminate the parameter to reduce diff against upstream.
MFC after: 2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jul 25
03:24:00 2014 (r269085)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jul 25
06:53:20 2014 (r269086)
@@ -5205,7 +5205,7 @@ l2arc_compress_buf(l2arc_buf_hdr_t *l2hd
len = l2hdr->b_asize;
cdata = zio_data_buf_alloc(len);
csize = zio_compress_data(ZIO_COMPRESS_LZ4, l2hdr->b_tmp_cdata,
- cdata, l2hdr->b_asize, (size_t)(1ULL <<
l2hdr->b_dev->l2ad_vdev->vdev_ashift));
+ cdata, l2hdr->b_asize);
rounded = P2ROUNDUP(csize, (size_t)SPA_MINBLOCKSIZE);
if (rounded > csize) {
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
Fri Jul 25 03:24:00 2014 (r269085)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
Fri Jul 25 06:53:20 2014 (r269086)
@@ -81,7 +81,7 @@ extern int lz4_decompress(void *src, voi
* Compress and decompress data if necessary.
*/
extern size_t zio_compress_data(enum zio_compress c, void *src, void *dst,
- size_t s_len, size_t minblocksize);
+ size_t s_len);
extern int zio_decompress_data(enum zio_compress c, void *src, void *dst,
size_t s_len, size_t d_len);
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jul 25
03:24:00 2014 (r269085)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jul 25
06:53:20 2014 (r269086)
@@ -1160,10 +1160,8 @@ zio_write_bp_init(zio_t **ziop)
}
if (compress != ZIO_COMPRESS_OFF) {
- metaslab_class_t *mc = spa_normal_class(spa);
void *cbuf = zio_buf_alloc(lsize);
- psize = zio_compress_data(compress, zio->io_data, cbuf, lsize,
- (size_t)metaslab_class_get_minblocksize(mc));
+ psize = zio_compress_data(compress, zio->io_data, cbuf, lsize);
if (psize == 0 || psize == lsize) {
compress = ZIO_COMPRESS_OFF;
zio_buf_free(cbuf, lsize);
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c Fri Jul
25 03:24:00 2014 (r269085)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c Fri Jul
25 06:53:20 2014 (r269086)
@@ -97,8 +97,7 @@ zio_compress_select(enum zio_compress ch
}
size_t
-zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len,
- size_t minblocksize)
+zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len)
{
uint64_t *word, *word_end;
size_t c_len, d_len;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
