librgw: incremental

* move RGWLibRequest decls into rgw_file.h
* revise include guard token in rados/rgw_file.h (avoid conflict)
* save CephContext* in RGWLibRequest
* initialize RGWLibRequest cct in ctor, req_state in process_request

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h
index 73c5127ce99..facb559208b 100644
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@ -121,17 +121,12 @@ public:
 }; /* RGWLibIO */
 
 class RGWLibRequest : public RGWRequest {
-private:
-  struct req_state* s;
-
 public:
-  RGWLibRequest(uint64_t req_id)
-    :  RGWRequest(req_id), s(nullptr)
-    {}
+  CephContext* cct;
 
-  void set_state(req_state* _s) {
-    s = _s;
-  }
+  RGWLibRequest(CephContext* _cct)
+    :  RGWRequest(0), cct(_cct)
+    {}
 
   virtual bool only_bucket() = 0;