pg: remove do_complete_notify

This method has no dependence on the pg.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index eb86dacc3386c92fbcd5b3108ee57435f3cb729d..14a7af9319a8d00a649f94b278f779e78573326c 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1070,11 +1070,6 @@ void ReplicatedPG::dump_watchers(ObjectContext *obc)
   }
 }
 
-void ReplicatedPG::do_complete_notify(Watch::Notification *notif, ObjectContext *obc)
-{
-  osd->complete_notify((void *)notif, obc);
-}
-
 void ReplicatedPG::remove_watcher(ObjectContext *obc, entity_name_t entity)
 {
   dout(10) << "remove_watcher " << *obc << " " << entity << dendl;
@@ -2401,7 +2396,7 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
 
       notif->reply = new MWatchNotify(p->cookie, oi.user_version.version, notif->id, WATCH_NOTIFY_COMPLETE, notif->bl);
       if (notif->watchers.empty()) {
-       do_complete_notify(notif, obc);
+       osd->complete_notify(notif, obc);
       } else {
        obc->notifs[notif] = true;
        obc->ref++;

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index d139d9839285c5e9d03195e076d1a9884500e6ff..8d73c0b8543c2a815bc22c2eef0e7ce708e70313 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -604,7 +604,6 @@ protected:
 
   void dump_watchers(ObjectContext *obc);
   void remove_watcher(ObjectContext *obc, entity_name_t entity);
-  void do_complete_notify(Watch::Notification *notif, ObjectContext *obc);
   void remove_watchers();
 
   struct RepModify {