From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 16 Nov 2015 15:06:59 +0000 (+0100)
Subject: rgw: fix RGWSystemMetaObj::rename
X-Git-Tag: v10.1.0~354^2~209
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d065ef4948734f9bcfeeab34d6b3ce5be60ccd34;p=ceph.git

rgw: fix RGWSystemMetaObj::rename

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 8440d3ff8140..e72d716ee9f4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -509,13 +509,13 @@ int RGWSystemMetaObj::rename(const string& new_name)
   if (!ret) {
     return -EEXIST;
   }
-  if (ret < 0) {
+  if (ret < 0 && ret != -ENOENT) {
     lderr(cct) << "Error read_id " << new_name << ": " << cpp_strerror(-ret) << dendl;
     return ret;
   }
   string old_name = name;
   name = new_name;
-  ret = store_info(true);
+  ret = update();
   if (ret < 0) {
     lderr(cct) << "Error storing new obj info " << new_name << ": " << cpp_strerror(-ret) << dendl;
     return ret;