From a955f5297d6951517c663ac9effd94adfae6a563 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sat, 22 Oct 2016 02:07:33 +0900 Subject: [PATCH] Add blockdev_size() support for OpenBSD This commit is OpenBSD version of 1116dc04 in 2015. This is exactly the same as the previous commit for NetBSD. OpenBSD still has block device as a file type, thus it differs from FreeBSD/DragonFlyBSD regarding FIO_HAVE_CHARDEV_SIZE. Note that fio doesn't compile on OpenBSD 5.9 (hits lex error), but this this commit should still be good since this function alone compiles on OpenBSD. Signed-off-by: Tomohiro Kusumi Signed-off-by: Jens Axboe --- os/os-openbsd.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/os/os-openbsd.h b/os/os-openbsd.h index 29985109..3343cbdf 100644 --- a/os/os-openbsd.h +++ b/os/os-openbsd.h @@ -6,6 +6,9 @@ #include #include #include +#include +#include +#include /* XXX hack to avoid conflicts between rbtree.h and */ #include #undef RB_BLACK @@ -15,7 +18,6 @@ #include "../file.h" #undef FIO_HAVE_ODIRECT -#define FIO_USE_GENERIC_BDEV_SIZE #define FIO_USE_GENERIC_RAND #define FIO_USE_GENERIC_INIT_RANDOM_STATE #define FIO_HAVE_FS_STAT @@ -35,6 +37,19 @@ typedef off_t off64_t; +static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) +{ + struct disklabel dl; + + if (!ioctl(f->fd, DIOCGDINFO, &dl)) { + *bytes = ((unsigned long long)dl.d_secperunit) * dl.d_secsize; + return 0; + } + + *bytes = 0; + return errno; +} + static inline int blockdev_invalidate_cache(struct fio_file *f) { return EINVAL; -- 2.25.1