rgw: various encoding related fixes

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>

diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc
index cf41ca5480d4597891a8bfeff9bed1495c82fc9b..fc6cca0e9c5ca4d673bc9be5271610b8fcfbc56c 100644 (file)
--- a/src/rgw/rgw_cache.cc
+++ b/src/rgw/rgw_cache.cc
@@ -42,7 +42,7 @@ void ObjectCacheInfo::dump(Formatter *f) const
   f->close_section();
 
   f->open_array_section("rm_xattrs");
-  for (; iter != rm_xattrs.end(); ++iter) {
+  for (iter = rm_xattrs.begin(); iter != rm_xattrs.end(); ++iter) {
     f->dump_string("name", iter->first);
     f->open_object_section("value");
     f->dump_unsigned("length", iter->second.length());

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 78808fb0c03be614cbffbd1343d8807e761c36fc..3acdd8be5e3941f06a1ce7c474b0fc27af0092a4 100644 (file)
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -32,7 +32,6 @@ struct ObjectMetaInfo {
   }
   void decode(bufferlist::iterator& bl) {
     DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
-    ::decode(struct_v, bl);
     ::decode(size, bl);
     utime_t t;
     ::decode(t, bl);

diff --git a/src/rgw/rgw_cls_api.h b/src/rgw/rgw_cls_api.h
index 974570c17a2525c91350eb394006bdaa538799e5..072abafb3056635c6bf8f8286755470ad1bc911c 100644 (file)
--- a/src/rgw/rgw_cls_api.h
+++ b/src/rgw/rgw_cls_api.h
@@ -14,8 +14,8 @@
 #define CEPH_RGW_TAG_TIMEOUT 60*60*24
 
 enum RGWPendingState {
-  CLS_RGW_STATE_PENDING_MODIFY,
-  CLS_RGW_STATE_COMPLETE,
+  CLS_RGW_STATE_PENDING_MODIFY = 0,
+  CLS_RGW_STATE_COMPLETE       = 1,
 };
 
 enum RGWModifyOp {
@@ -28,6 +28,8 @@ struct rgw_bucket_pending_info {
   utime_t timestamp;
   uint8_t op;
 
+  rgw_bucket_pending_info() : state(CLS_RGW_STATE_PENDING_MODIFY), op(0) {}
+
   void encode(bufferlist &bl) const {
     ENCODE_START(2, 2, bl);
     uint8_t s = (uint8_t)state;
@@ -104,7 +106,6 @@ struct rgw_bucket_dir_entry {
 
   void encode(bufferlist &bl) const {
     ENCODE_START(3, 3, bl);
-    ::encode(struct_v, bl);
     ::encode(name, bl);
     ::encode(epoch, bl);
     ::encode(exists, bl);
@@ -135,6 +136,8 @@ struct rgw_bucket_category_stats {
   uint64_t total_size_rounded;
   uint64_t num_entries;
 
+  rgw_bucket_category_stats() : total_size(0), total_size_rounded(0), num_entries(0) {}
+
   void encode(bufferlist &bl) const {
     ENCODE_START(2, 2, bl);
     ::encode(total_size, bl);
@@ -200,6 +203,8 @@ struct rgw_cls_obj_prepare_op
   string tag;
   string locator;
 
+  rgw_cls_obj_prepare_op() : op(0) {}
+
   void encode(bufferlist &bl) const {
     ENCODE_START(3, 3, bl);
     ::encode(op, bl);
@@ -264,6 +269,8 @@ struct rgw_cls_list_op
   string start_obj;
   uint32_t num_entries;
 
+  rgw_cls_list_op() : num_entries(0) {}
+
   void encode(bufferlist &bl) const {
     ENCODE_START(2, 2, bl);
     ::encode(start_obj, bl);

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 28f20060a143cebf322a814b261a5783be615a42..98720011e1c539a918653dc018b67b929af45406 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -666,6 +666,8 @@ struct RGWUploadPartInfo {
   string etag;
   utime_t modified;
 
+  RGWUploadPartInfo() : num(0), size(0) {}
+
   void encode(bufferlist& bl) const {
     ENCODE_START(2, 2, bl);
     ::encode(num, bl);

diff --git a/src/rgw/rgw_log.h b/src/rgw/rgw_log.h
index 1f3890df48bac5853f46d8cf57abf50016fb7e1e..b3878c4d3501956b716d003a6be202c648294f8c 100644 (file)
--- a/src/rgw/rgw_log.h
+++ b/src/rgw/rgw_log.h
@@ -93,7 +93,6 @@ struct rgw_intent_log_entry {
 
   void encode(bufferlist &bl) const {
     ENCODE_START(2, 2, bl);
-    ::encode(struct_v, bl);
     ::encode(obj, bl);
     ::encode(op_time, bl);
     ::encode(intent, bl);