Revert "Remove wrong ASSERT in annotate_ecksum"

This reverts commit 093911f1945b5c164a45bb077103283dafdcae0c.

Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Closes #7079

diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c
index 3b17d3ac2834a700982beb1876426ecefbbacbf3..c68ab772a151d9b33c51dff1f2c0cd9e724a0d1d 100644 (file)
--- a/module/zfs/zfs_fm.c
+++ b/module/zfs/zfs_fm.c
@@ -486,8 +486,7 @@ update_histogram(uint64_t value_arg, uint16_t *hist, uint32_t *count)
        /* We store the bits in big-endian (largest-first) order */
        for (i = 0; i < 64; i++) {
                if (value & (1ull << i)) {
-                       if (hist[63 - i] < UINT16_MAX)
-                               hist[63 - i]++;
+                       hist[63 - i]++;
                        ++bits;
                }
        }
@@ -644,6 +643,7 @@ annotate_ecksum(nvlist_t *ereport, zio_bad_cksum_t *info,
        if (badabd == NULL || goodabd == NULL)
                return (eip);
 
+       ASSERT3U(nui64s, <=, UINT16_MAX);
        ASSERT3U(size, ==, nui64s * sizeof (uint64_t));
        ASSERT3U(size, <=, SPA_MAXBLOCKSIZE);
        ASSERT3U(size, <=, UINT32_MAX);