From: amitkuma <amitkuma@redhat.com>
Date: Thu, 21 Sep 2017 12:54:40 +0000 (+0530)
Subject: rgw: Returning when dst_ioctx.operate() returns error
X-Git-Tag: v13.0.2~599^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f700e7da88aa85e2d6922e6e68d2fa0b91b1c6e;p=ceph.git

rgw: Returning when dst_ioctx.operate() returns error

** 1396179 Unused value
CID 1396179 (#1 of 1): Unused value (UNUSED_VALUE)
returned_value: Assigning value from dst_ioctx->operate(dst_oid, &wop)
to ret here, but that stored value is overwritten before it can be used.

Signed-off-by: Amit Kumar <amitkuma@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 09d38c5111f4..214d9e366403 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -6386,6 +6386,9 @@ int RGWRados::move_rados_obj(librados::IoCtx& src_ioctx,
     }
     wop.write(ofs, data);
     ret = dst_ioctx.operate(dst_oid, &wop);
+    if (ret < 0) {
+      goto done_err;
+    }
     ofs += data.length();
     done = data.length() != chunk_size;
   } while (!done);
@@ -6402,6 +6405,7 @@ int RGWRados::move_rados_obj(librados::IoCtx& src_ioctx,
   return 0;
 
 done_err:
+  // TODO: clean up dst_oid if we created it
   lderr(cct) << "ERROR: failed to copy " << src_oid << " -> " << dst_oid << dendl;
   return ret;
 }