From 675c1e44f2650ce2070164a0b29da6fdc7ceb9c0 Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Sat, 1 Oct 2016 17:49:34 +0100 Subject: [PATCH] osd/ReplicatedPG:move C_OSD_OnApplied class to cc Signed-off-by: Michal Jarzabek --- src/osd/ReplicatedPG.cc | 17 +++++++++++++++++ src/osd/ReplicatedPG.h | 17 +---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 68f9b930e6e34..c47c72d945d93 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -77,6 +77,23 @@ PGLSFilter::~PGLSFilter() { } +struct ReplicatedPG::C_OSD_OnApplied : Context { + ReplicatedPGRef pg; + epoch_t epoch; + eversion_t v; + C_OSD_OnApplied( + ReplicatedPGRef pg, + epoch_t epoch, + eversion_t v) + : pg(pg), epoch(epoch), v(v) {} + void finish(int) override { + pg->lock(); + if (!pg->pg_has_reset_since(epoch)) + pg->op_applied(v); + pg->unlock(); + } +}; + /** * The CopyCallback class defines an interface for completions to the * copy_start code. Users of the copy infrastructure must implement diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index c65da4cb8a5bc..219f42bef77f0 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -340,22 +340,7 @@ public: append_log(logv, trim_to, trim_rollback_to, t, transaction_applied); } - struct C_OSD_OnApplied : Context { - ReplicatedPGRef pg; - epoch_t epoch; - eversion_t v; - C_OSD_OnApplied( - ReplicatedPGRef pg, - epoch_t epoch, - eversion_t v) - : pg(pg), epoch(epoch), v(v) {} - void finish(int) override { - pg->lock(); - if (!pg->pg_has_reset_since(epoch)) - pg->op_applied(v); - pg->unlock(); - } - }; + struct C_OSD_OnApplied; void op_applied( const eversion_t &applied_version); -- 2.39.5