From: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
Date: Tue, 3 Apr 2012 18:30:57 +0000 (-0700)
Subject: cls_rgw: reset return code in some cases
X-Git-Tag: v0.45~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ebb487a617df5cf4d90c1aa8ba87ed23b51de8c3;p=ceph.git

cls_rgw: reset return code in some cases

Beforehand the return code was ignored, so fixed the cases
where we erroneously return error instead of success.

Signed-off-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
---

diff --git a/src/cls_rgw.cc b/src/cls_rgw.cc
index fd2e4d797e67..85603fad6413 100644
--- a/src/cls_rgw.cc
+++ b/src/cls_rgw.cc
@@ -140,6 +140,8 @@ int rgw_bucket_prepare_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   if (rc < 0 && rc != -ENOENT)
     return rc;
 
+  rc = 0;
+
   struct rgw_bucket_dir_entry entry;
   if (rc != -ENOENT) {
     bufferlist::iterator biter = cur_value.begin();
@@ -198,6 +200,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
     if (rc != -ENOENT) {
       return rc;
     } else {
+      rc = 0;
       entry.name = op.name;
       entry.epoch = op.epoch;
       entry.meta = op.meta;