From 0d28eb3637ba18979f6f95c3575e859d87fe1b98 Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Wed, 19 Jul 2017 11:51:24 +0800 Subject: [PATCH] aio: move aio.h/cc from fs dir to bluestore dir Signed-off-by: Pan Liu --- src/os/CMakeLists.txt | 4 ++-- src/os/bluestore/BlockDevice.h | 2 +- src/os/bluestore/KernelDevice.h | 2 +- src/os/bluestore/PMEMDevice.h | 2 +- src/os/{fs => bluestore}/aio.cc | 0 src/os/{fs => bluestore}/aio.h | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename src/os/{fs => bluestore}/aio.cc (100%) rename src/os/{fs => bluestore}/aio.h (100%) diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt index 5edbb2db96a8..a98fe1db0606 100644 --- a/src/os/CMakeLists.txt +++ b/src/os/CMakeLists.txt @@ -16,8 +16,7 @@ set(libos_srcs memstore/MemStore.cc kstore/KStore.cc kstore/kstore_types.cc - fs/FS.cc - fs/aio.cc) + fs/FS.cc) if(HAVE_LIBAIO) list(APPEND libos_srcs @@ -34,6 +33,7 @@ if(HAVE_LIBAIO) bluestore/StupidAllocator.cc bluestore/BitMapAllocator.cc bluestore/BitAllocator.cc + bluestore/aio.cc ) endif(HAVE_LIBAIO) diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h index f2b48f05a8bd..5d511ddbb570 100644 --- a/src/os/bluestore/BlockDevice.h +++ b/src/os/bluestore/BlockDevice.h @@ -23,7 +23,7 @@ #include #include "acconfig.h" -#include "os/fs/aio.h" +#include "aio.h" #define SPDK_PREFIX "spdk:" diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h index faccde3d5ba0..f04b7f972af3 100644 --- a/src/os/bluestore/KernelDevice.h +++ b/src/os/bluestore/KernelDevice.h @@ -18,9 +18,9 @@ #include #include "os/fs/FS.h" -#include "os/fs/aio.h" #include "include/interval_set.h" +#include "aio.h" #include "BlockDevice.h" class KernelDevice : public BlockDevice { diff --git a/src/os/bluestore/PMEMDevice.h b/src/os/bluestore/PMEMDevice.h index a908c7876e7b..c08e3cc5f2f1 100644 --- a/src/os/bluestore/PMEMDevice.h +++ b/src/os/bluestore/PMEMDevice.h @@ -20,8 +20,8 @@ #include #include "os/fs/FS.h" -#include "os/fs/aio.h" #include "include/interval_set.h" +#include "aio.h" #include "BlockDevice.h" class PMEMDevice : public BlockDevice { diff --git a/src/os/fs/aio.cc b/src/os/bluestore/aio.cc similarity index 100% rename from src/os/fs/aio.cc rename to src/os/bluestore/aio.cc diff --git a/src/os/fs/aio.h b/src/os/bluestore/aio.h similarity index 100% rename from src/os/fs/aio.h rename to src/os/bluestore/aio.h -- 2.47.3