From 6f2e82b997e95e356067a0bae045582946c9fdd0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 22 Feb 2017 11:51:36 -0600 Subject: [PATCH] osd/osd_types: move SnapSetContext to osd_internal_types Signed-off-by: Sage Weil --- src/osd/osd_internal_types.h | 11 +++++++++++ src/osd/osd_types.h | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/osd/osd_internal_types.h b/src/osd/osd_internal_types.h index d754109ad58a..924a8be0c378 100644 --- a/src/osd/osd_internal_types.h +++ b/src/osd/osd_internal_types.h @@ -14,6 +14,17 @@ * replicas ack. */ +struct SnapSetContext { + hobject_t oid; + SnapSet snapset; + int ref; + bool registered : 1; + bool exists : 1; + + explicit SnapSetContext(const hobject_t& o) : + oid(o), ref(0), registered(false), exists(true) { } +}; + struct ObjectContext; struct ObjectState { diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index dcbce601dd02..8d4209a40428 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -4538,19 +4538,6 @@ struct object_info_t { }; WRITE_CLASS_ENCODER_FEATURES(object_info_t) -struct SnapSetContext { - hobject_t oid; - SnapSet snapset; - int ref; - bool registered : 1; - bool exists : 1; - - explicit SnapSetContext(const hobject_t& o) : - oid(o), ref(0), registered(false), exists(true) { } -}; - - - ostream& operator<<(ostream& out, const object_info_t& oi); -- 2.47.3