Merge pull request #10726 from weiqiaomiao/wqm-wip-remove-ret

rgw: remove the field ret from class RGWPutLC

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

diff --cc src/rgw/rgw_op.cc
index 4c913bc9cc2251dce83ee24ef8b0c9f4cb8b7e95,91fe08971159885d0fd609b902fd55ab51ac52fe..13ce9c59828ec3c44d1db503202cc8a2877f736d
--- 1/src/rgw/rgw_op.cc
--- 2/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@@ -3980,11 -3928,10 +3979,11 @@@ void RGWPutLC::execute(
    rados::cls::lock::Lock l(lc_index_lock_name); 
    utime_t time(max_lock_secs, 0);
    l.set_duration(time);
 +  l.set_cookie(cookie);
    librados::IoCtx *ctx = store->get_lc_pool_ctx();
    do {
-     ret = l.lock_exclusive(ctx, oid);
-     if (ret == -EBUSY) {
+     op_ret = l.lock_exclusive(ctx, oid);
+     if (op_ret == -EBUSY) {
        dout(0) << "RGWLC::RGWPutLC() failed to acquire lock on, sleep 5, try again" << oid << dendl;
        sleep(5);
        continue;

diff --cc src/rgw/rgw_op.h
index 87d19334efb60a28e776572989ff209dc739c66c,5f55c3086c00a3e6f665c00a7d6fc6b86bad79da..b52242331624c5f0216459a0cde71b597e394df1
--- 1/src/rgw/rgw_op.h
--- 2/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@@ -1029,10 -1029,8 +1028,9 @@@ public
  
  class RGWPutLC : public RGWOp {
  protected:
-   int ret;
    size_t len;
    char *data;
 +  string cookie;
  
  public:
    RGWPutLC() {

diff --cc src/rgw/rgw_rest.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge