From 9dacb904c573b7b33da2703bbfbc7b6cc9855f07 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 21 Jan 2019 19:26:10 +0800
Subject: [PATCH] crimson/osd: remove "force_new" from ms_get_authorizer()

it was removed in e62f45d1, so update crimson-osd accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/crimson/osd/chained_dispatchers.cc | 9 +++------
 src/crimson/osd/chained_dispatchers.h  | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/crimson/osd/chained_dispatchers.cc b/src/crimson/osd/chained_dispatchers.cc
index 9f1b0f771ba..da4aa269ee3 100644
--- a/src/crimson/osd/chained_dispatchers.cc
+++ b/src/crimson/osd/chained_dispatchers.cc
@@ -39,16 +39,14 @@ ChainedDispatchers::ms_handle_remote_reset(ceph::net::ConnectionRef conn) {
 }
 
 seastar::future<std::unique_ptr<AuthAuthorizer>>
-ChainedDispatchers::ms_get_authorizer(peer_type_t peer_type, bool force_new)
+ChainedDispatchers::ms_get_authorizer(peer_type_t peer_type)
 {
   // since dispatcher returns a nullptr if it does not have the authorizer,
   // let's use the chain-of-responsibility pattern here.
   struct Params {
     peer_type_t peer_type;
-    bool force_new;
     std::deque<Dispatcher*>::iterator first, last;
-  } params = {peer_type, force_new,
-              dispatchers.begin(), dispatchers.end()};
+  } params = {peer_type, dispatchers.begin(), dispatchers.end()};
   return seastar::do_with(Params{params}, [this] (Params& params) {
     using result_t = std::unique_ptr<AuthAuthorizer>;
     return seastar::repeat_until_value([&] () {
@@ -57,8 +55,7 @@ ChainedDispatchers::ms_get_authorizer(peer_type_t peer_type, bool force_new)
         // just give up
         return seastar::make_ready_future<std::optional<result_t>>(result_t{});
       } else {
-        return (*first)->ms_get_authorizer(params.peer_type,
-                                           params.force_new)
+        return (*first)->ms_get_authorizer(params.peer_type)
           .then([&] (auto&& auth)-> std::optional<result_t> {
           if (auth) {
             // hooray!
diff --git a/src/crimson/osd/chained_dispatchers.h b/src/crimson/osd/chained_dispatchers.h
index a287e500e49..c30408361ba 100644
--- a/src/crimson/osd/chained_dispatchers.h
+++ b/src/crimson/osd/chained_dispatchers.h
@@ -28,5 +28,5 @@ public:
   seastar::future<> ms_handle_reset(ceph::net::ConnectionRef conn) override;
   seastar::future<> ms_handle_remote_reset(ceph::net::ConnectionRef conn) override;
   seastar::future<std::unique_ptr<AuthAuthorizer>>
-  ms_get_authorizer(peer_type_t peer_type, bool force_new) override;
+  ms_get_authorizer(peer_type_t peer_type) override;
 };
-- 
2.39.5