Skip to content

Commit a2a1e0e

Browse files
mmatuskalundman
authored andcommitted
FreeBSD: unbreak compilation on i386
tests/zfs-tests/cmd/mmap_seek.c: use correct printf specifier module/zfs/vdev.c: vdev_clear(): correctly cast argument to atomic_add_64(). Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Martin Matuska <mm@FreeBSD.org> Closes openzfs#18096
1 parent 4499833 commit a2a1e0e

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

module/zfs/vdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4674,7 +4674,7 @@ vdev_clear(spa_t *spa, vdev_t *vd)
46744674
vd->vdev_stat.vs_checksum_errors = 0;
46754675
vd->vdev_stat.vs_dio_verify_errors = 0;
46764676
vd->vdev_stat.vs_slow_ios = 0;
4677-
atomic_store_64(&vd->vdev_outlier_count, 0);
4677+
atomic_store_64((volatile uint64_t *)&vd->vdev_outlier_count, 0);
46784678
vd->vdev_read_sit_out_expire = 0;
46794679

46804680
for (int c = 0; c < vd->vdev_children; c++)

tests/zfs-tests/cmd/mmap_seek.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,27 @@
4747
#endif
4848

4949
static void
50+
seek_expect(int fd, off_t offset, int whence, off_t expect_offset)
51+
{
52+
errno = 0;
53+
#if defined(SEEK_HOLE) && defined(SEEK_DATA)
54+
off_t seek_offset = lseek(fd, offset, whence);
55+
if (seek_offset == expect_offset)
56+
return;
57+
58+
int err = errno;
59+
fprintf(stderr, "lseek(fd, %jd, SEEK_%s) = %jd (expected %jd)",
60+
offset, (whence == SEEK_DATA ? "DATA" : "HOLE"),
61+
seek_offset, expect_offset);
62+
if (err != 0)
63+
fprintf(stderr, " (errno %d [%s])\n", err, strerror(err));
64+
else
65+
fputc('\n', stderr);
66+
#endif
67+
exit(2);
68+
}
69+
70+
static inline void
5071
seek_data(int fd, off_t offset, off_t expected)
5172
{
5273
#if defined(SEEK_HOLE) && defined(SEEK_DATA)

0 commit comments

Comments
 (0)