From: Jiaying Ren Date: Tue, 2 May 2017 04:03:18 +0000 (+0800) Subject: rgw: drop unused param "head" from bucket_lc_post X-Git-Tag: v12.0.3~32^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e13400d507b73a962e5fe34aabb5341cfa74ee1;p=ceph.git rgw: drop unused param "head" from bucket_lc_post Signed-off-by: Jiaying Ren --- diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index fcb2359d11e..403edbd4653 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -495,8 +495,7 @@ int RGWLC::bucket_lc_process(string& shard_id) return ret; } -int RGWLC::bucket_lc_post(int index, int max_lock_sec, cls_rgw_lc_obj_head& head, - pair& entry, int& result) +int RGWLC::bucket_lc_post(int index, int max_lock_sec, pair& entry, int& result) { utime_t lock_duration(cct->_conf->rgw_lc_lock_max_time, 0); @@ -636,7 +635,7 @@ int RGWLC::process(int index, int max_lock_secs) } l.unlock(&store->lc_pool_ctx, obj_names[index]); ret = bucket_lc_process(entry.first); - ret = bucket_lc_post(index, max_lock_secs, head, entry, ret); + bucket_lc_post(index, max_lock_secs, entry, ret); return 0; exit: l.unlock(&store->lc_pool_ctx, obj_names[index]); diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h index e66735e3a2c..16bd56babd5 100644 --- a/src/rgw/rgw_lc.h +++ b/src/rgw/rgw_lc.h @@ -262,8 +262,7 @@ class RGWLC { int list_lc_progress(const string& marker, uint32_t max_entries, map *progress_map); int bucket_lc_prepare(int index); int bucket_lc_process(string& shard_id); - int bucket_lc_post(int index, int max_lock_sec, cls_rgw_lc_obj_head& head, - pair& entry, int& result); + int bucket_lc_post(int index, int max_lock_sec, pair& entry, int& result); bool going_down(); void start_processor(); void stop_processor();