Skip to content

Commit 433f27f

Browse files
BrainSlayerc0d3z3r0
authored andcommitted
add missing fields
(fixed by c0d3z3r0) Signed-off-by: Sebastian Gottschall <[email protected]> Signed-off-by: Michael Niewöhner <[email protected]>
1 parent 5feaff0 commit 433f27f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmd/zdb/zdb.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3510,6 +3510,8 @@ dump_l2arc_log_entries(uint64_t log_entries,
35103510
(u_longlong_t)L2BLK_GET_PSIZE((&le[j])->le_prop));
35113511
(void) printf("|\t\t\t\tcompr: %llu\n",
35123512
(u_longlong_t)L2BLK_GET_COMPRESS((&le[j])->le_prop));
3513+
(void) printf("|\t\t\t\tcomplevel: %llu\n",
3514+
(u_longlong_t)(&le[j])->le_complevel);
35133515
(void) printf("|\t\t\t\ttype: %llu\n",
35143516
(u_longlong_t)L2BLK_GET_TYPE((&le[j])->le_prop));
35153517
(void) printf("|\t\t\t\tprotected: %llu\n",
@@ -3594,11 +3596,12 @@ dump_l2arc_log_blocks(int fd, l2arc_dev_hdr_phys_t l2dhdr)
35943596
case ZIO_COMPRESS_OFF:
35953597
break;
35963598
case ZIO_COMPRESS_LZ4:
3599+
case ZIO_COMPRESS_ZSTD:
35973600
abd = abd_alloc_for_io(psize, B_TRUE);
35983601
abd_copy_from_buf_off(abd, &this_lb, 0, psize);
35993602
zio_decompress_data(L2BLK_GET_COMPRESS(
36003603
(&lbps[0])->lbp_prop), abd, &this_lb,
3601-
psize, sizeof (this_lb));
3604+
psize, sizeof (this_lb), NULL);
36023605
abd_free(abd);
36033606
break;
36043607
default:

include/sys/arc_impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,13 @@ typedef struct l2arc_log_ent_phys {
258258
*/
259259
uint64_t le_prop;
260260
uint64_t le_daddr; /* buf location on l2dev */
261+
uint64_t le_complevel;
261262
/*
262263
* We pad the size of each entry to a power of 2 so that the size of
263264
* l2arc_log_blk_phys_t is power-of-2 aligned with SPA_MINBLOCKSHIFT,
264265
* because of the L2ARC_SET_*SIZE macros.
265266
*/
266-
const uint64_t le_pad[3]; /* pad to 64 bytes */
267+
const uint64_t le_pad[2]; /* pad to 64 bytes */
267268
} l2arc_log_ent_phys_t;
268269

269270
#define L2ARC_LOG_BLK_MAX_ENTRIES (1022)

0 commit comments

Comments
 (0)