From: tang.jin Date: Thu, 16 Mar 2017 11:31:43 +0000 (+0800) Subject: osd: delete the copy assignment operator, replace it to decode() X-Git-Tag: v12.0.1~23^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13938%2Fhead;p=ceph.git osd: delete the copy assignment operator, replace it to decode() Signed-off-by: tang.jin --- diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 3a75d8932e92..dc20b637f93b 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3871,7 +3871,7 @@ void PG::_scan_snaps(ScrubMap &smap) bl.push_back(o.attrs[OI_ATTR]); object_info_t oi; try { - oi = bl; + oi.decode(bl); } catch(...) { o.nlinks = 0; continue; diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 7fe56fe707f8..2ef809ef2c7f 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -4117,10 +4117,6 @@ struct object_info_t { explicit object_info_t(bufferlist& bl) { decode(bl); } - object_info_t operator=(bufferlist& bl) { - decode(bl); - return *this; - } }; WRITE_CLASS_ENCODER_FEATURES(object_info_t)