diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-04-19 18:14:28 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-04-19 18:14:28 -0700 |
| commit | c4f8adca837fb9f7271b4fd7dea21b5fcd229c1e (patch) | |
| tree | 42e75de338aa8c22fda45be42e01d05b538b6e06 /src/osd/OSD.h | |
| parent | 481c532ff361b21e044621ac13c8f00ebfb1b3dc (diff) | |
| parent | 870f47c7cb24b5da7a7e3a5ba45f140e268c0754 (diff) | |
| download | ceph-c4f8adca837fb9f7271b4fd7dea21b5fcd229c1e.tar.gz | |
Merge branch 'wip-4201' into next
Reviewed-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 8a74cd8b630..513bd43ec6c 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -552,6 +552,11 @@ public: getline(ss, s); return hobject_t(sobject_t(object_t(s.c_str()), 0)); } + static hobject_t make_infos_oid() { + hobject_t oid(sobject_t("infos", CEPH_NOSNAP)); + return oid; + } + static void clear_temp(ObjectStore *store, coll_t tmp); private: @@ -1023,8 +1028,6 @@ protected: friend class C_OSD_GetVersion; - static void clear_temp(ObjectStore *store, coll_t tmp); - // -- alive -- epoch_t up_thru_wanted; epoch_t up_thru_pending; |