]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove temporary variable
authorYan Jun <yan.jun8@zte.com.cn>
Fri, 8 Jul 2016 08:31:12 +0000 (16:31 +0800)
committerYan Jun <yan.jun8@zte.com.cn>
Mon, 11 Jul 2016 10:45:23 +0000 (18:45 +0800)
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
src/rgw/rgw_cache.h
src/rgw/rgw_rados.cc

index f04ced9948bd979ac9372dcb2b4ea64d324019b1..c8783e1e836a8794fa0491580711a5cf2db6e4d8 100644 (file)
@@ -526,8 +526,7 @@ int RGWCache<T>::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 <class T>
index 9e072479cd6bdad51881ce2fbeab8a51b7e0dbf8..4027a004fecc4a0ea25905904e804250c8d0afbf 100644 (file)
@@ -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)