From c2e604403405a6a3b20e37b1e2b2119053bf4be8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 12 Aug 2018 15:04:00 -0500 Subject: [PATCH] osd: remove auid session member Signed-off-by: Sage Weil --- src/osd/OSD.cc | 2 -- src/osd/PG.cc | 2 +- src/osd/Session.h | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 1e08ad43eec..e3925c0b2b9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6627,7 +6627,6 @@ bool OSD::ms_verify_authorizer( AuthCapsInfo caps_info; EntityName name; uint64_t global_id; - uint64_t auid = CEPH_AUTH_UID_DEFAULT; auto keys = monc->rotating_secrets.get(); if (keys) { @@ -6653,7 +6652,6 @@ bool OSD::ms_verify_authorizer( s->entity_name = name; if (caps_info.allow_all) s->caps.set_allow_all(); - s->auid = auid; if (caps_info.caps.length() > 0) { auto p = caps_info.caps.cbegin(); diff --git a/src/osd/PG.cc b/src/osd/PG.cc index e960a60ce3b..c34dc718cde 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2142,7 +2142,7 @@ bool PG::op_has_sufficient_caps(OpRequestRef& op) << "session=" << session << " pool=" << pool.id << " (" << pool.name << " " << req->get_hobj().nspace - << ") owner=" << pool.info.auid + << ")" << " pool_app_metadata=" << pool.info.application_metadata << " need_read_cap=" << op->need_read_cap() << " need_write_cap=" << op->need_write_cap() diff --git a/src/osd/Session.h b/src/osd/Session.h index 8b0e897f31a..127e287c845 100644 --- a/src/osd/Session.h +++ b/src/osd/Session.h @@ -130,7 +130,6 @@ struct Backoff : public RefCountedObject { struct Session : public RefCountedObject { EntityName entity_name; OSDCap caps; - int64_t auid; ConnectionRef con; entity_addr_t socket_addr; WatchConState wstate; @@ -152,7 +151,7 @@ struct Session : public RefCountedObject { explicit Session(CephContext *cct, Connection *con_) : RefCountedObject(cct), - auid(-1), con(con_), + con(con_), socket_addr(con_->get_peer_socket_addr()), wstate(cct), session_dispatch_lock("Session::session_dispatch_lock"), -- 2.39.5