diff options
| author | Roald J. van Loon <roaldvanloon@gmail.com> | 2013-09-07 15:16:27 +0200 |
|---|---|---|
| committer | Roald J. van Loon <roaldvanloon@gmail.com> | 2013-09-07 22:41:10 +0200 |
| commit | bb312b689a6e8824cac0c6dd64cccb0152d788d1 (patch) | |
| tree | 30d17d95ef9c1e4c7a47aa9a8b43b12b4d045ca4 | |
| parent | 09b42c033f7b6a204da8c24e47bf99d21f678b1a (diff) | |
| download | ceph-bb312b689a6e8824cac0c6dd64cccb0152d788d1.tar.gz | |
automake cleanup: moving hobject from os to common
This file is used by libcommon, so lets put it in src/common instead of
src/os.
Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/common/hobject.cc (renamed from src/os/hobject.cc) | 0 | ||||
| -rw-r--r-- | src/common/hobject.h (renamed from src/os/hobject.h) | 0 | ||||
| -rw-r--r-- | src/os/FDCache.h | 2 | ||||
| -rw-r--r-- | src/os/WBThrottle.h | 2 | ||||
| -rw-r--r-- | src/osd/SnapMapper.h | 2 | ||||
| -rw-r--r-- | src/osd/osd_types.h | 2 | ||||
| -rw-r--r-- | src/test/encoding/types.h | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cf08504a76d..9380a8ed8cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1594,7 +1594,7 @@ libcommon_files = \ msg/Pipe.cc \ msg/SimpleMessenger.cc \ msg/msg_types.cc \ - os/hobject.cc \ + common/hobject.cc \ osd/OSDMap.cc \ osd/osd_types.cc \ mds/MDSMap.cc \ @@ -2240,7 +2240,7 @@ noinst_HEADERS = \ os/btrfs_ioctl.h\ os/ZFS.h\ os/chain_xattr.h\ - os/hobject.h \ + common/hobject.h \ os/CollectionIndex.h\ os/FileJournal.h\ os/FileStore.h\ diff --git a/src/os/hobject.cc b/src/common/hobject.cc index d6273693c62..d6273693c62 100644 --- a/src/os/hobject.cc +++ b/src/common/hobject.cc diff --git a/src/os/hobject.h b/src/common/hobject.h index 633e471dffc..633e471dffc 100644 --- a/src/os/hobject.h +++ b/src/common/hobject.h diff --git a/src/os/FDCache.h b/src/os/FDCache.h index f0f40e7bbf4..00e632f3e0f 100644 --- a/src/os/FDCache.h +++ b/src/os/FDCache.h @@ -18,7 +18,7 @@ #include <memory> #include <errno.h> #include <cstdio> -#include "hobject.h" +#include "common/hobject.h" #include "common/Mutex.h" #include "common/Cond.h" #include "common/shared_cache.hpp" diff --git a/src/os/WBThrottle.h b/src/os/WBThrottle.h index 070de08e123..d480a6b751c 100644 --- a/src/os/WBThrottle.h +++ b/src/os/WBThrottle.h @@ -20,7 +20,7 @@ #include <tr1/memory> #include "include/buffer.h" #include "common/Formatter.h" -#include "os/hobject.h" +#include "common/hobject.h" #include "include/interval_set.h" #include "FDCache.h" #include "common/Thread.h" diff --git a/src/osd/SnapMapper.h b/src/osd/SnapMapper.h index 560cc43497f..f0d0baa2190 100644 --- a/src/osd/SnapMapper.h +++ b/src/osd/SnapMapper.h @@ -21,7 +21,7 @@ #include <string.h> #include "common/map_cacher.hpp" -#include "os/hobject.h" +#include "common/hobject.h" #include "include/buffer.h" #include "include/encoding.h" #include "include/object.h" diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 312eb81e3fd..da139b853b1 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -26,7 +26,7 @@ #include "include/interval_set.h" #include "common/snap_types.h" #include "common/Formatter.h" -#include "os/hobject.h" +#include "common/hobject.h" #include "Watch.h" #define CEPH_OSD_ONDISK_MAGIC "ceph osd volume v026" diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index a6f7cfb7883..514c76fc1a8 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -75,7 +75,7 @@ TYPE(ObjectStore::Transaction) #include "os/SequencerPosition.h" TYPE(SequencerPosition) -#include "os/hobject.h" +#include "common/hobject.h" TYPE(hobject_t) #include "mon/AuthMonitor.h" |