From 131d15a772254881e64e948eb603bf59687a5b4d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 13 Nov 2012 15:42:52 -0800 Subject: [PATCH] rgw: fix warning Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 3f550c2a9784b..5da22d2ad7f7f 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -963,7 +963,7 @@ class RGWPutObjProcessor_Aio : public RGWPutObjProcessor protected: uint64_t obj_len; - int handle_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle); + int handle_obj_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle); int throttle_data(void *handle); RGWPutObjProcessor_Aio() : max_chunks(RGW_MAX_PENDING_CHUNKS), obj_len(0) {} @@ -972,7 +972,7 @@ protected: } }; -int RGWPutObjProcessor_Aio::handle_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle) +int RGWPutObjProcessor_Aio::handle_obj_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle) { if ((uint64_t)abs_ofs + bl.length() > obj_len) obj_len = abs_ofs + bl.length(); @@ -1086,7 +1086,7 @@ public: } if (ofs >= next_part_ofs) prepare_next_part(ofs); - int r = RGWPutObjProcessor_Aio::handle_data(cur_obj, bl, ofs - cur_part_ofs, ofs, phandle); + int r = RGWPutObjProcessor_Aio::handle_obj_data(cur_obj, bl, ofs - cur_part_ofs, ofs, phandle); return r; } -- 2.39.5