From d2b5e926b812fecfa6fa90ffbd689712eb553f81 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Dec 2015 11:34:22 -0500 Subject: [PATCH] os/fs: move btrfs_ioctl.h to os/fs Signed-off-by: Sage Weil --- src/common/sync_filesystem.h | 2 +- src/os/Makefile.am | 2 +- src/os/filestore/BtrfsFileStoreBackend.cc | 2 +- src/os/{ => fs}/btrfs_ioctl.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/os/{ => fs}/btrfs_ioctl.h (100%) diff --git a/src/common/sync_filesystem.h b/src/common/sync_filesystem.h index a664a86d308..f457f655df5 100644 --- a/src/common/sync_filesystem.h +++ b/src/common/sync_filesystem.h @@ -20,7 +20,7 @@ #if defined(__linux__) #include #include -#include "../os/btrfs_ioctl.h" +#include "os/fs/btrfs_ioctl.h" #endif inline int sync_filesystem(int fd) diff --git a/src/os/Makefile.am b/src/os/Makefile.am index bd2bac7d275..967a7b7a445 100644 --- a/src/os/Makefile.am +++ b/src/os/Makefile.am @@ -68,7 +68,6 @@ noinst_HEADERS += \ os/bluestore/BlueStore.h \ os/bluestore/FreelistManager.h \ os/bluestore/StupidAllocator.h \ - os/btrfs_ioctl.h \ os/filestore/chain_xattr.h \ os/filestore/BtrfsFileStoreBackend.h \ os/filestore/CollectionIndex.h \ @@ -86,6 +85,7 @@ noinst_HEADERS += \ os/filestore/WBThrottle.h \ os/filestore/XfsFileStoreBackend.h \ os/filestore/ZFSFileStoreBackend.h + os/fs/btrfs_ioctl.h \ os/fs/FS.h \ os/fs/XFS.h \ os/keyvaluestore/GenericObjectMap.h \ diff --git a/src/os/filestore/BtrfsFileStoreBackend.cc b/src/os/filestore/BtrfsFileStoreBackend.cc index 19a6e353aab..97421c5be19 100644 --- a/src/os/filestore/BtrfsFileStoreBackend.cc +++ b/src/os/filestore/BtrfsFileStoreBackend.cc @@ -29,7 +29,7 @@ #include "include/assert.h" #ifndef __CYGWIN__ -#include "os/btrfs_ioctl.h" +#include "os/fs/btrfs_ioctl.h" #endif #include diff --git a/src/os/btrfs_ioctl.h b/src/os/fs/btrfs_ioctl.h similarity index 100% rename from src/os/btrfs_ioctl.h rename to src/os/fs/btrfs_ioctl.h -- 2.47.3