From 3d7fa4f725ec77fbd7d2cebd5785593eb7c4b246 Mon Sep 17 00:00:00 2001
From: Matt Benjamin <mbenjamin@redhat.com>
Date: Mon, 1 Feb 2016 14:45:48 -0500
Subject: [PATCH] librgw: remove RGWLibRequest "magic" numbers added for
 debugging

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---
 src/rgw/rgw_file.h | 13 -------------
 src/rgw/rgw_op.h   |  3 +--
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 3f3d375c62478..6b1209df9fa35 100644
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -856,7 +856,6 @@ public:
 	marker += "/";
       marker += sm;
     }
-    magic = 71;
     op = this;
   }
 
@@ -962,7 +961,6 @@ public:
       marker.name += sm;
     }
     default_max = 1000; // XXX was being omitted
-    magic = 72;
     op = this;
   }
 
@@ -1115,7 +1113,6 @@ public:
   RGWCreateBucketRequest(CephContext* _cct, RGWUserInfo *_user,
 			std::string& _uri)
     : RGWLibRequest(_cct, _user), uri(_uri) {
-    magic = 73;
     op = this;
   }
 
@@ -1183,7 +1180,6 @@ public:
   RGWDeleteBucketRequest(CephContext* _cct, RGWUserInfo *_user,
 			std::string& _uri)
     : RGWLibRequest(_cct, _user), uri(_uri) {
-    magic = 74;
     op = this;
   }
 
@@ -1252,7 +1248,6 @@ public:
 		  buffer::list& _bl)
     : RGWLibRequest(_cct, _user), bucket_name(_bname), obj_name(_oname),
       bl(_bl), bytes_written(0) {
-    magic = 75;
     op = this;
   }
 
@@ -1342,7 +1337,6 @@ public:
 		 void *_ulp_buffer)
     : RGWLibRequest(_cct, _user), rgw_fh(_rgw_fh), ulp_buffer(_ulp_buffer),
       nread(0), read_resid(len) {
-    magic = 76;
     op = this;
 
     /* fixup RGWGetObj (already know range parameters) */
@@ -1435,7 +1429,6 @@ public:
   RGWDeleteObjRequest(CephContext* _cct, RGWUserInfo *_user,
 		      const std::string& _bname, const std::string& _oname)
     : RGWLibRequest(_cct, _user), bucket_name(_bname), obj_name(_oname) {
-    magic = 77;
     op = this;
   }
 
@@ -1492,7 +1485,6 @@ public:
 		    uint32_t _flags)
     : RGWLibRequest(_cct, _user), bucket_name(_bname), obj_name(_oname),
       _size(0), flags(_flags) {
-    magic = 78;
     op = this;
 
     /* fixup RGWGetObj (already know range parameters) */
@@ -1580,7 +1572,6 @@ public:
 		       const std::string& _path)
     : RGWLibRequest(_cct, _user) {
     uri = "/" + _path;
-    magic = 79;
     op = this;
   }
 
@@ -1648,7 +1639,6 @@ public:
     : RGWLibRequest(_cct, _user), rgw_fh(_rgw_fh), path(_path),
       matched(false), is_dir(false) {
     default_max = 1000; // logical max {"foo", "foo/"}
-    magic = 80;
     op = this;
   }
 
@@ -1761,8 +1751,6 @@ public:
     if (ret == 0) {
       ret = init_from_header(get_state());
     }
-
-    magic = 81;
     op = this;
   }
 
@@ -1862,7 +1850,6 @@ public:
 		    const std::string& _src_name, const std::string& _dst_name)
     : RGWLibRequest(_cct, _user), src_parent(_src_parent),
       dst_parent(_dst_parent), src_name(_src_name), dst_name(_dst_name) {
-    magic = 82;
     op = this;
   }
 
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 517fa476ec395..398534d582bd6 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -92,12 +92,11 @@ protected:
   RGWQuotaInfo bucket_quota;
   RGWQuotaInfo user_quota;
   int op_ret;
-  uint32_t magic;
 
   virtual int init_quota();
 public:
 RGWOp() : s(nullptr), dialect_handler(nullptr), store(nullptr),
-    cors_exist(false), op_ret(0), magic(0) {}
+    cors_exist(false), op_ret(0) {}
 
   virtual ~RGWOp() {}
 
-- 
2.39.5