rgw: Fix some merge problems uncovered by gcc warnings:

 * a refactor in e2100bce left the mod_ptr and unmod_ptr members set
   incorrectly in RGWCopyObj::init_common
 * a fix in 6752babd aggregated error returns, but then failed to do
   anything with them

Signed-off-by: Josh Pieper <jjp@pobox.com>
Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 802734ec80a5cd19645ba6d917d60fdaf24e73b7..42b4c25e2e6c03f4d74c76dafdb467cc1a396be6 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1004,10 +1004,6 @@ int RGWCopyObj::verify_permission()
 
 int RGWCopyObj::init_common()
 {
-  time_t mod_time;
-  time_t unmod_time;
-  time_t *mod_ptr = NULL;
-  time_t *unmod_ptr = NULL;
   if (if_mod) {
     if (parse_time(if_mod, &mod_time) < 0) {
       ret = -EINVAL;

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index d9c19dd1786818a371db542c4fc2932e2de30b82..6557c38a92839daf0d8d217765b680ab1d63046a 100644 (file)
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -309,6 +309,8 @@ protected:
   off_t ofs;
   off_t len;
   off_t end;
+  time_t mod_time;
+  time_t unmod_time;
   time_t *mod_ptr;
   time_t *unmod_ptr;
   int ret;

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 147763d49778fe759d7d5ab5e7948968a8373c17..146050b56af12aa2fedd73fa50488c1b3f26062f 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -915,7 +915,7 @@ int RGWRados::set_buckets_enabled(vector<rgw_bucket>& buckets, bool enabled)
       continue;
     }
   }
-  return 0;
+  return ret;
 }
 
 int RGWRados::bucket_suspended(rgw_bucket& bucket, bool *suspended)