Skip to content

Commit

Permalink
Switch ztest mmap(2) ASSERTs to VERIFYs
Browse files Browse the repository at this point in the history
This is just a small bit of cleanup to ensure ztest fails early
on systems where mmap(2) is not functioning.  For the automated
testing which is the primary consumer of ztest there is no
functional change because debugging is always enabled.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#2177
  • Loading branch information
ryao authored and behlendorf committed Mar 12, 2014
1 parent 85802aa commit 2026196
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/ztest/ztest.c
Original file line number Diff line number Diff line change
Expand Up @@ -6086,7 +6086,7 @@ setup_hdr(void)

hdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()),
PROT_READ | PROT_WRITE, MAP_SHARED, ztest_fd_data, 0);
ASSERT(hdr != MAP_FAILED);
VERIFY3P(hdr, !=, MAP_FAILED);

VERIFY3U(0, ==, ftruncate(ztest_fd_data, sizeof (ztest_shared_hdr_t)));

Expand All @@ -6113,14 +6113,14 @@ setup_data(void)

hdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()),
PROT_READ, MAP_SHARED, ztest_fd_data, 0);
ASSERT(hdr != MAP_FAILED);
VERIFY3P(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);
ASSERT(hdr != MAP_FAILED);
VERIFY3P(hdr, !=, MAP_FAILED);
buf = (uint8_t *)hdr;

offset = hdr->zh_hdr_size;
Expand Down

0 comments on commit 2026196

Please sign in to comment.