]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: lease_stack: use reset method instead of assignment 16180/head
authorNathan Cutler <ncutler@suse.com>
Thu, 6 Jul 2017 18:17:49 +0000 (20:17 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 20 Jul 2017 20:32:42 +0000 (22:32 +0200)
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)

src/rgw/rgw_sync.cc

index 799dd3fb34885288e984967391ac95beacbc60bf..d2d3cf0a06683dd1abce74d6f4220f523eb17d67 100644 (file)
@@ -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()) {