From a5c88f61cbec5071499105c76e477eee2b9bc690 Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Fri, 17 Nov 2017 11:59:26 -0500 Subject: [PATCH] rgw clean-up: remove unused var & func in RGWRados::SystemObject Signed-off-by: J. Eric Ivancich --- src/rgw/rgw_rados.cc | 5 ----- src/rgw/rgw_rados.h | 10 ++++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 89bf8851a80..859b52f0ca4 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -9863,11 +9863,6 @@ int RGWRados::Object::Read::range_to_ofs(uint64_t obj_size, int64_t &ofs, int64_ return 0; } -int RGWRados::SystemObject::get_state(RGWRawObjState **pstate, RGWObjVersionTracker *objv_tracker) -{ - return store->get_system_obj_state(&ctx, obj, pstate, objv_tracker); -} - int RGWRados::stat_system_obj(RGWObjectCtx& obj_ctx, RGWRados::SystemObject::Read::GetObjState& state, rgw_raw_obj& obj, diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 3b5147d077e..8153c9e5199 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -2650,13 +2650,11 @@ public: RGWObjectCtx& ctx; rgw_raw_obj obj; - RGWObjState *state; - - protected: - int get_state(RGWRawObjState **pstate, RGWObjVersionTracker *objv_tracker); - public: - SystemObject(RGWRados *_store, RGWObjectCtx& _ctx, rgw_raw_obj& _obj) : store(_store), ctx(_ctx), obj(_obj), state(NULL) {} + + SystemObject(RGWRados *_store, RGWObjectCtx& _ctx, rgw_raw_obj& _obj) : + store(_store), ctx(_ctx), obj(_obj) + {} void invalidate_state(); -- 2.39.5