From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 20 Jan 2016 21:07:13 +0000 (+0100)
Subject: rgw: fix create_default to handle EEXIST
X-Git-Tag: v10.1.0~354^2~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2f7438dba402013f8e6b09b502efe233865baad;p=ceph.git

rgw: fix create_default to handle EEXIST

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index bdfdd470bea5..bc2b21668e07 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -163,8 +163,8 @@ int RGWZoneGroup::create_default(bool old_format)
     r = zone_params.init(cct, store);
     if (r < 0) {
       derr << "create_default: error in init existing zone params: " << cpp_strerror(-r) << dendl;
+      return r;
     }
-    return r;
   }
   
   RGWZone& default_zone = zones[zone_params.get_id()];