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 <kusumi.tomohiro@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/os/os-openbsd.h b/os/os-openbsd.h
index 299851090b2423ef5f36ab855d9cb70e1f748334..3343cbdfbb18384ded0d4cfe0b145216cbf27590 100644 (file)
--- a/os/os-openbsd.h
+++ b/os/os-openbsd.h
@@ -6,6 +6,9 @@
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/statvfs.h>
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/statvfs.h>

+#include <sys/ioctl.h>
+#include <sys/dkio.h>
+#include <sys/disklabel.h>

 /* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */
 #include <sys/sysctl.h>
 #undef RB_BLACK
 /* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */
 #include <sys/sysctl.h>
 #undef RB_BLACK


@@ -15,7 +18,6 @@
 #include "../file.h"
 
 #undef  FIO_HAVE_ODIRECT
 #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
 #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;
 
 
 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;
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
        return EINVAL;