Skip to content

Commit

Permalink
Fix unreachable code in zstreamdump
Browse files Browse the repository at this point in the history
82226e4 was intended to prevent a
warning from being printed in situations where it was inappropriate, but
accidentally disabled it entirely by setting featureflags in the wrong
case statement.

Coverity reported this as dead code.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes openzfs#13946
  • Loading branch information
ryao authored Sep 29, 2022
1 parent 4acc36e commit dee8934
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/zstream/zstream_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,6 @@ zstream_do_dump(int argc, char *argv[])
BSWAP_64(drrb->drr_fromguid);
}

featureflags =
DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);

(void) printf("BEGIN record\n");
(void) printf("\thdrtype = %lld\n",
DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo));
Expand Down Expand Up @@ -465,6 +462,9 @@ zstream_do_dump(int argc, char *argv[])
BSWAP_64(drro->drr_maxblkid);
}

featureflags =
DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);

if (featureflags & DMU_BACKUP_FEATURE_RAW &&
drro->drr_bonuslen > drro->drr_raw_bonuslen) {
(void) fprintf(stderr,
Expand Down

0 comments on commit dee8934

Please sign in to comment.