From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 4 Oct 2016 22:48:05 +0000 (-0700)
Subject: Merge pull request #10726 from weiqiaomiao/wqm-wip-remove-ret
X-Git-Tag: v11.0.1~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91a70c3e51f26d0f124a9bf7b9c7294fe730a5dc;p=ceph.git

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>
---

91a70c3e51f26d0f124a9bf7b9c7294fe730a5dc
diff --cc src/rgw/rgw_op.cc
index 4c913bc9cc22,91fe08971159..13ce9c59828e
--- a/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 87d19334efb6,5f55c3086c00..b52242331624
--- a/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() {