From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 6 Jul 2017 18:17:49 +0000 (+0200)
Subject: rgw: lease_stack: use reset method instead of assignment
X-Git-Tag: v11.2.1~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16180%2Fhead;p=ceph.git

rgw: lease_stack: use reset method instead of assignment

It seems that the intent of 45877d38fd9a385b2f8b13e90be94d784898b0b3 was to
change all instances of "lease_stack = ..." to "lease_stack.reset(...)", but
this one was missed.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fc425afeb2e2a6ba3c98c612b3977aea619c9f73)

Conflicts:
	src/rgw/rgw_sync.cc (trivial)
---

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 799dd3fb348..d2d3cf0a066 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -791,7 +791,7 @@ public:
                                                 sync_env->store->get_zone_params().log_pool,
                                                 sync_env->status_oid(), lock_name,
                                                 lock_duration, this));
-        lease_stack = spawn(lease_cr.get(), false);
+        lease_stack.reset(spawn(lease_cr.get(), false));
       }
       while (!lease_cr->is_locked()) {
         if (lease_cr->is_done()) {