From a05dd63c8b26a2270ccb717ca750bc091a672857 Mon Sep 17 00:00:00 2001
From: Daniel Gollub <daniel.gollub@gmail.com>
Date: Thu, 1 May 2014 19:56:23 +0200
Subject: [PATCH] Latest fio fixed double-declaration issues

Signed-off-by: Daniel Gollub <daniel.gollub@gmail.com>
---
 src/test/fio_ceph_filestore.cc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/test/fio_ceph_filestore.cc b/src/test/fio_ceph_filestore.cc
index fc7c360c4fa..24b1ed9c03d 100644
--- a/src/test/fio_ceph_filestore.cc
+++ b/src/test/fio_ceph_filestore.cc
@@ -9,16 +9,7 @@
 #include "os/FileStore.h"
 #include "global/global_init.h"
 
-/* silence some fio.h include issues.
- * fio.h needs to made robust for third-party software.
- */
-#undef ARRAY_SIZE /* double declartion */
-#define CONFIG_CPU_COUNT /* double declaration: fio.h should check if CPU_COUNT alread got defined */
-#undef le16_to_cpu
-#undef le32_to_cpu
-#undef le64_to_cpu
-
-#include "fio.h"
+#include <fio.h>
 
 struct fio_ceph_filestore_iou {
 	struct io_u *io_u;
-- 
2.39.5