Skip to content

Commit 482ae13

Browse files
committed
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() Signed-off-by: Martin Matuska <mm@FreeBSD.org>
1 parent b9b8444 commit 482ae13

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ seek_expect(int fd, off_t offset, int whence, off_t expect_offset)
5555
return;
5656

5757
int err = errno;
58-
fprintf(stderr, "lseek(fd, %ld, SEEK_%s) = %ld (expected %ld)",
58+
fprintf(stderr, "lseek(fd, %jd, SEEK_%s) = %jd (expected %jd)",
5959
offset, (whence == SEEK_DATA ? "DATA" : "HOLE"),
6060
seek_offset, expect_offset);
6161
if (err != 0)

0 commit comments

Comments
 (0)