From 799402d8c79d3fb3ef75e181a5abed1af8ccc242 Mon Sep 17 00:00:00 2001 From: Richard Yao <ryao@gentoo.org> Date: Fri, 11 Dec 2015 18:42:42 -0500 Subject: [PATCH] Revert "Switch ztest mmap(2) ASSERTs to VERIFYs" This reverts commit 202619623022722f30c2ee49931a4fa6896421c7. It is no longer necessary now that we pass -DDEBUG unconditionally. Signed-off-by: Richard Yao <ryao@gentoo.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #4095 --- cmd/ztest/ztest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 1dc9eff770..22666aee1b 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -6185,7 +6185,7 @@ setup_hdr(void) hdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()), PROT_READ | PROT_WRITE, MAP_SHARED, ztest_fd_data, 0); - VERIFY3P(hdr, !=, MAP_FAILED); + ASSERT(hdr != MAP_FAILED); VERIFY3U(0, ==, ftruncate(ztest_fd_data, sizeof (ztest_shared_hdr_t))); @@ -6212,14 +6212,14 @@ setup_data(void) hdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()), PROT_READ, MAP_SHARED, ztest_fd_data, 0); - VERIFY3P(hdr, !=, MAP_FAILED); + ASSERT(hdr != MAP_FAILED); size = shared_data_size(hdr); (void) munmap((caddr_t)hdr, P2ROUNDUP(sizeof (*hdr), getpagesize())); hdr = ztest_shared_hdr = (void *)mmap(0, P2ROUNDUP(size, getpagesize()), PROT_READ | PROT_WRITE, MAP_SHARED, ztest_fd_data, 0); - VERIFY3P(hdr, !=, MAP_FAILED); + ASSERT(hdr != MAP_FAILED); buf = (uint8_t *)hdr; offset = hdr->zh_hdr_size;