From: Pritha Srivastava <prsrivas@redhat.com>
Date: Fri, 8 May 2020 18:51:46 +0000 (+0530)
Subject: cls/rgw_gc: Fixing the iterator used to access urgent data map
X-Git-Tag: v15.2.5~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af2b54bf9722c8af5557dc06811ae6a65bc8ba9e;p=ceph.git

cls/rgw_gc: Fixing the iterator used to access urgent data map
in xattr in cls_rgw_gc. The incorrect iterator caused a crash
in osd.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit d5b895498ef921ed840f05de95eabe6b2f806e4b)
---

diff --git a/src/cls/rgw_gc/cls_rgw_gc.cc b/src/cls/rgw_gc/cls_rgw_gc.cc
index f45fb2df22fc..bb3c2ffc1576 100644
--- a/src/cls/rgw_gc/cls_rgw_gc.cc
+++ b/src/cls/rgw_gc/cls_rgw_gc.cc
@@ -426,7 +426,7 @@ static int cls_rgw_gc_queue_update_entry(cls_method_context_t hctx, bufferlist *
       } //end - catch
       auto xattr_iter = xattr_urgent_data_map.find(op.info.tag);
       if (xattr_iter != xattr_urgent_data_map.end()) {
-        it->second = op.info.time;
+        xattr_iter->second = op.info.time;
         tag_found = true;
         //write the updated map back
         bufferlist bl_map;