]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix decoding
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 4 Aug 2011 00:05:43 +0000 (17:05 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 4 Aug 2011 22:58:34 +0000 (15:58 -0700)
src/rgw/rgw_rados.cc

index 2064c729755fcca193fc982d67e878bf1d961654..03355dba582e3b4788fe1a3c80cc88f6adb62424 100644 (file)
@@ -711,15 +711,9 @@ int RGWRados::get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, librados::IoCtx& io
 
   RGW_LOG(0) << "outbl.length()=" << outbl.length() << dendl;
 
-  /* argh for this whole block */
   bufferlist::iterator oiter = outbl.begin();
-  bufferlist bl;
-  ::decode(bl, oiter);
-  bufferlist::iterator bliter = bl.begin();
-  ::decode(s->attrset, bliter);
-  ::decode(s->size, bliter);
-  ::decode(bl, oiter);
-  bliter = bl.begin();
+  ::decode(s->attrset, oiter);
+  ::decode(s->size, oiter);
   ::decode(s->mtime, oiter);
 
   s->has_attrs = true;