Merge pull request #17722 from amitkumar50/cov-rgw-6

rgw: Initialization of epoch,len
ceph · Oct 23, 2017 · 6bef8e3 · 6bef8e3
2 parents 33191d2 + 17df8c9
commit 6bef8e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
@@ -265,6 +265,8 @@ namespace rgw {
       : fs(_fs), bucket(nullptr), parent(nullptr), variant_type{directory()},
 	depth(0), flags(FLAG_NONE)
       {
+        fh.fh_hk.bucket = 0;
+        fh.fh_hk.object = 0;
 	/* root */
 	fh.fh_type = RGW_FS_TYPE_DIRECTORY;
 	variant_type = directory();

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
@@ -2091,7 +2091,7 @@ class RGWGetObjLayout : public RGWOp {
 };
 
 class RGWPutBucketPolicy : public RGWOp {
-  int len;
+  int len = 0;
   char *data = nullptr;
 public:
   RGWPutBucketPolicy() = default;

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
@@ -958,7 +958,7 @@ struct RGWRawObjState {
   bool exists{false};
   uint64_t size{0};
   ceph::real_time mtime;
-  uint64_t epoch;
+  uint64_t epoch{0};
   bufferlist obj_tag;
   bool has_data{false};
   bufferlist data;