]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: drop unused param "head" from bucket_lc_post
authorJiaying Ren <jiaying.ren@umcloud.com>
Tue, 2 May 2017 04:03:18 +0000 (12:03 +0800)
committerJiaying Ren <jiaying.ren@umcloud.com>
Tue, 2 May 2017 04:03:18 +0000 (12:03 +0800)
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
src/rgw/rgw_lc.cc
src/rgw/rgw_lc.h

index fcb2359d11e55207328b87bc98aba082b4524633..403edbd465376e8f9153d3d9ae4fa053f21dabb1 100644 (file)
@@ -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<string, int >& entry, int& result)
+int RGWLC::bucket_lc_post(int index, int max_lock_sec, pair<string, int >& 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]);
index e66735e3a2ce589ce3b112571ab19645522d5ea2..16bd56babd56be6c49f36aabc1a96d7f88f5e8fb 100644 (file)
@@ -262,8 +262,7 @@ class RGWLC {
   int list_lc_progress(const string& marker, uint32_t max_entries, map<string, int> *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<string, int >& entry, int& result);
+  int bucket_lc_post(int index, int max_lock_sec, pair<string, int >& entry, int& result);
   bool going_down();
   void start_processor();
   void stop_processor();