From: Yan Jun Date: Fri, 8 Jul 2016 08:31:12 +0000 (+0800) Subject: rgw: remove temporary variable X-Git-Tag: ses5-milestone5~187^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=372f77a1fa2e0a3b793192a80c143286937af966;p=ceph.git rgw: remove temporary variable Signed-off-by: Yan Jun --- diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index f04ced9948bd..c8783e1e836a 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -526,8 +526,7 @@ int RGWCache::distribute_cache(const string& normal_name, rgw_obj& obj, Objec info.obj = obj; bufferlist bl; ::encode(info, bl); - int ret = T::distribute(normal_name, bl); - return ret; + return T::distribute(normal_name, bl); } template diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 9e072479cd6b..4027a004fecc 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -10892,8 +10892,7 @@ int RGWRados::distribute(const string& key, bufferlist& bl) pick_control_oid(key, notify_oid); ldout(cct, 10) << "distributing notification oid=" << notify_oid << " bl.length()=" << bl.length() << dendl; - int r = control_pool_ctx.notify2(notify_oid, bl, 0, NULL); - return r; + return control_pool_ctx.notify2(notify_oid, bl, 0, NULL); } int RGWRados::pool_iterate_begin(rgw_bucket& bucket, RGWPoolIterCtx& ctx)