From 856fd0243346ca99fa4a3ba5014a7bcdf2c29450 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 7 Jun 2018 08:20:54 -0500 Subject: [PATCH] osd/PG: move send_notify() into RecoveryCtx Signed-off-by: Sage Weil --- src/osd/PG.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index 083056dff825c..c9656412b38c7 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1033,6 +1033,12 @@ public: ovec.insert(ovec.end(), i->second.begin(), i->second.end()); } } + + void send_notify(pg_shard_t to, + const pg_notify_t &info, const PastIntervals &pi) { + assert(notify_list); + (*notify_list)[to.osd].push_back(make_pair(info, pi)); + } }; protected: @@ -1994,8 +2000,7 @@ protected: void send_notify(pg_shard_t to, const pg_notify_t &info, const PastIntervals &pi) { assert(state->rctx); - assert(state->rctx->notify_list); - (*state->rctx->notify_list)[to.osd].push_back(make_pair(info, pi)); + state->rctx->send_notify(to, info, pi); } }; friend class RecoveryMachine; -- 2.39.5