]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fixed VERIFY3_IMPL() bug from 682ce104
authorTom Caputi <tcaputi@datto.com>
Thu, 13 Jul 2017 00:15:24 +0000 (20:15 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 13 Jul 2017 00:15:24 +0000 (17:15 -0700)
When VERIFY3_IMPL() was adjusted in 682ce104, the values of
the operands were omitted from the variadic arguments list.
This patch simply corrects this.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #6343

lib/libspl/include/assert.h

index b53942094727b86e880b4efb802cd4f12c33fcdd..026d6fef9df137842a8858b8e179a991ed559934 100644 (file)
@@ -72,7 +72,8 @@ do {                                                                  \
        const TYPE __right = (TYPE)(RIGHT);                             \
        if (!(__left OP __right))                                       \
                libspl_assertf(__FILE__, __FUNCTION__, __LINE__,        \
-                   "%s %s %s (0x%llx %s 0x%llx)", #LEFT, #OP, #RIGHT); \
+                   "%s %s %s (0x%llx %s 0x%llx)", #LEFT, #OP, #RIGHT,  \
+                   (u_longlong_t)__left, #OP, (u_longlong_t)__right);  \
 } while (0)
 
 #define        VERIFY3S(x, y, z)       VERIFY3_IMPL(x, y, z, int64_t)