From 808084825492721571d617e6c670dcf307ddffcd Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 10 Apr 2020 21:10:09 -0700 Subject: [PATCH] Minor `zstream redup` command fixes * Fix uninitialized variable in `zstream redup` command. The 'rdt.ddt_count' variable is uninitialized because it was allocated from the stack and not globally. Initialize it. This was reported by gcc when compiling with debugging enabled. zstream_redup.c:157:16: error: 'rdt.ddt_count' may be used uninitialized in this function [-Werror=maybe-uninitialized] * Remove the cmd/zstreamdump/.gitignore file. It's no longer needed now that the zstreamdump command is a script. Reviewed-by: Matthew Ahrens Signed-off-by: Brian Behlendorf Closes #10192 --- cmd/zstream/zstream_redup.c | 1 + cmd/zstreamdump/.gitignore | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 cmd/zstreamdump/.gitignore diff --git a/cmd/zstream/zstream_redup.c b/cmd/zstream/zstream_redup.c index 6720cfd120..9ed8df337f 100644 --- a/cmd/zstream/zstream_redup.c +++ b/cmd/zstream/zstream_redup.c @@ -218,6 +218,7 @@ zfs_redup_stream(int infd, int outfd, boolean_t verbose) rdt.ddecache = umem_cache_create("rde", sizeof (redup_entry_t), 0, NULL, NULL, NULL, NULL, NULL, 0); rdt.numhashbits = highbit64(numbuckets) - 1; + rdt.ddt_count = 0; char *buf = safe_calloc(bufsz); FILE *ofp = fdopen(infd, "r"); diff --git a/cmd/zstreamdump/.gitignore b/cmd/zstreamdump/.gitignore deleted file mode 100644 index ca44a529eb..0000000000 --- a/cmd/zstreamdump/.gitignore +++ /dev/null @@ -1 +0,0 @@ -zstreamdump