Project

General

Profile

Bug #8267

8067 is breaking the build

Added by Toomas Soome over 2 years ago. Updated over 2 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
zfs - Zettabyte File System
Start date:
2017-05-24
Due date:
% Done:

0%

Estimated time:
Difficulty:
Medium
Tags:
needs-triage

Description

cc1: warnings being treated as errors
../../common/fs/zfs/blkptr.c: In function 'decode_embedded_bp':
../../common/fs/zfs/blkptr.c:144: error: passing argument 2 of 'zio_decompress_data' from incompatible pointer type
../../common/fs/zfs/sys/zio_compress.h:111: note: expected 'struct abd_t *' but argument is of type 'uint8_t *'
*** Error code 1
dmake: Fatal error: Command failed for target `obj64/blkptr.o'

Apparently, the fix seems to be as trivial as:

diff --git a/usr/src/uts/common/fs/zfs/blkptr.c b/usr/src/uts/common/fs/zfs/blkptr.c
index 779539abbc..d7a7fdb0e1 100644
--- a/usr/src/uts/common/fs/zfs/blkptr.c
+++ b/usr/src/uts/common/fs/zfs/blkptr.c
@@ -141,7 +141,7 @@ decode_embedded_bp(const blkptr_t *bp, void *buf, int buflen)
        if (BP_GET_COMPRESS(bp) != ZIO_COMPRESS_OFF) {
                uint8_t dstbuf[BPE_PAYLOAD_SIZE];
                decode_embedded_bp_compressed(bp, dstbuf);
-               VERIFY0(zio_decompress_data(BP_GET_COMPRESS(bp),
+               VERIFY0(zio_decompress_data_buf(BP_GET_COMPRESS(bp),
                    dstbuf, buf, psize, buflen));
        } else {
                ASSERT3U(lsize, ==, psize);

Related issues

Related to illumos gate - Bug #8067: zdb should be able to dump literal embedded block pointerClosed2017-04-13

Actions

History

#1

Updated by Toomas Soome over 2 years ago

  • Description updated (diff)
#2

Updated by Toomas Soome over 2 years ago

  • Description updated (diff)
#3

Updated by Marcel Telka over 2 years ago

  • Related to Bug #8067: zdb should be able to dump literal embedded block pointer added
#4

Updated by Toomas Soome over 2 years ago

  • Status changed from New to Closed

The 8067 was backed out.

Also available in: Atom PDF