diff options
| author | Richard Yao <[email protected]> | 2015-12-11 18:42:42 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-12-14 12:53:14 -0800 |
| commit | 799402d8c79d3fb3ef75e181a5abed1af8ccc242 (patch) | |
| tree | 6d1db9f48f758fc4cd092d920674fdf215f0aa08 | |
| parent | 27075111ed93f5290fbb5d801964aa20ed7a9d35 (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #4095
| -rw-r--r-- | cmd/ztest/ztest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 1dc9eff77..22666aee1 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; |