From 7fb4712aeadcb2a095ad1efe8ddb098efe9d3342 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Tue, 18 Dec 2018 19:31:15 +0800
Subject: [PATCH] os: rename aio.h to avoid conflict

FreeBSD's libc offers <aio.h>.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/os/bluestore/BlockDevice.h         | 2 +-
 src/os/bluestore/KernelDevice.h        | 2 +-
 src/os/bluestore/PMEMDevice.h          | 2 +-
 src/os/bluestore/aio.cc                | 2 +-
 src/os/bluestore/{aio.h => ceph_aio.h} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/os/bluestore/{aio.h => ceph_aio.h} (100%)

diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h
index 5faa26073bafe..92c1443546b45 100644
--- a/src/os/bluestore/BlockDevice.h
+++ b/src/os/bluestore/BlockDevice.h
@@ -30,7 +30,7 @@
 #include "common/ceph_mutex.h"
 
 #ifdef HAVE_LIBAIO
-#include "aio.h"
+#include "ceph_aio.h"
 #endif
 #include "include/ceph_assert.h"
 #include "include/buffer.h"
diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h
index e4dbcda37048a..e24b45b3ac084 100644
--- a/src/os/bluestore/KernelDevice.h
+++ b/src/os/bluestore/KernelDevice.h
@@ -22,7 +22,7 @@
 #include "common/Thread.h"
 #include "include/utime.h"
 
-#include "aio.h"
+#include "ceph_aio.h"
 #include "BlockDevice.h"
 
 class KernelDevice : public BlockDevice {
diff --git a/src/os/bluestore/PMEMDevice.h b/src/os/bluestore/PMEMDevice.h
index 51c602968db1c..3077375a2ac85 100644
--- a/src/os/bluestore/PMEMDevice.h
+++ b/src/os/bluestore/PMEMDevice.h
@@ -21,7 +21,7 @@
 
 #include "os/fs/FS.h"
 #include "include/interval_set.h"
-#include "aio.h"
+#include "ceph_aio.h"
 #include "BlockDevice.h"
 
 class PMEMDevice : public BlockDevice {
diff --git a/src/os/bluestore/aio.cc b/src/os/bluestore/aio.cc
index 4811434492597..46856b85b61d0 100644
--- a/src/os/bluestore/aio.cc
+++ b/src/os/bluestore/aio.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include <algorithm>
-#include "aio.h"
+#include "ceph_aio.h"
 
 std::ostream& operator<<(std::ostream& os, const aio_t& aio)
 {
diff --git a/src/os/bluestore/aio.h b/src/os/bluestore/ceph_aio.h
similarity index 100%
rename from src/os/bluestore/aio.h
rename to src/os/bluestore/ceph_aio.h
-- 
2.39.5