From: Karol Mroz <kmroz@suse.com>
Date: Mon, 11 Apr 2016 12:54:54 +0000 (+0200)
Subject: rgw-rados: return RGWSystemMetaObj init directly
X-Git-Tag: ses3-milestone4~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8534%2Fhead;p=ceph.git

rgw-rados: return RGWSystemMetaObj init directly

Signed-off-by: Karol Mroz <kmroz@suse.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 2bcc7b64ced1..1f2ce65b87df 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1549,12 +1549,7 @@ int RGWZoneParams::init(CephContext *cct, RGWRados *store, bool setup_obj, bool
     name = cct->_conf->rgw_zone;
   }
 
-  int ret = RGWSystemMetaObj::init(cct, store, setup_obj, old_format);
-  if (ret < 0) {
-    return ret;
-  }
-
-  return ret;
+  return RGWSystemMetaObj::init(cct, store, setup_obj, old_format);
 }
 
 int RGWZoneParams::read_default_id(string& default_id, bool old_format)