From b1a6f77eb69a71e23170859fe5f7bc7070a0cff8 Mon Sep 17 00:00:00 2001
From: Adam Kupczyk <akupczyk@mirantis.com>
Date: Tue, 19 Apr 2016 11:44:13 +0200
Subject: [PATCH] Renamed and moved RGWPutObjEncryptFilter -> RGWPutObj_Filter.

Signed-off-by: Adam Kupczyk (akupczyk@mirantis.com)
---
 src/rgw/rgw_op.cc | 19 -------------------
 src/rgw/rgw_op.h  | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 90e67d74a8985..da434a95c2522 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2831,25 +2831,6 @@ int RGWPutObjProcessor_Multipart::do_complete(string& etag, real_time *mtime, re
   return r;
 }
 
-
-
-class RGWPutObjEncryptFilter : public RGWPutObjDataProcessor
-{
-protected:
-  RGWPutObjDataProcessor& next;
-public:
-  RGWPutObjEncryptFilter(RGWPutObjDataProcessor& next) :
-  next(next){}
-  virtual ~RGWPutObjEncryptFilter(){}
-  virtual int handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again) {
-    return next.handle_data(bl, ofs, phandle, again);
-  }
-  virtual int throttle_data(void *handle, bool need_to_wait) {
-    return next.throttle_data(handle, need_to_wait);
-  }
-}; /* RGWPutObjEncryptFilter */
-
-
 RGWPutObjProcessor *RGWPutObj::select_processor(RGWObjectCtx& obj_ctx, bool *is_multipart)
 {
   RGWPutObjProcessor *processor;
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 17832ed44f40d..01e21d5f9752e 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -776,6 +776,22 @@ public:
   virtual uint32_t op_mask() { return RGW_OP_TYPE_WRITE; }
 };
 
+class RGWPutObj_Filter : public RGWPutObjDataProcessor
+{
+protected:
+  RGWPutObjDataProcessor& next;
+public:
+  RGWPutObj_Filter(RGWPutObjDataProcessor& next) :
+  next(next){}
+  virtual ~RGWPutObj_Filter(){}
+  virtual int handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again) {
+    return next.handle_data(bl, ofs, phandle, again);
+  }
+  virtual int throttle_data(void *handle, bool need_to_wait) {
+    return next.throttle_data(handle, need_to_wait);
+  }
+}; /* RGWPutObj_Filter */
+
 class RGWPostObj : public RGWOp {
 protected:
   off_t min_len;
-- 
2.39.5