From: Ruan Zitao <ruanzitao@kuaishou.com>
Date: Wed, 21 Oct 2020 03:06:40 +0000 (+0800)
Subject: cls/rgw/cls_rgw.cc: fix multiple lastest version problem
X-Git-Tag: v15.2.9~87^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=870b843c2ac29f6d24e89742907b38c2079c9c72;p=ceph.git

cls/rgw/cls_rgw.cc: fix multiple lastest version problem

Fixes: https://tracker.ceph.com/issues/47919

Signed-off-by: Ruan Zitao <ruanzitao@kuaishou.com>
Signed-off-by: Yang Honggang <yanghonggang@kuaishou.com>
(cherry picked from commit f60f9ace1a4bceeda256373cf4603058e1947fa8)
---

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index cba9a2d73492a..788a040e1816c 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -968,9 +968,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   entry.index_ver = header.ver;
   /* resetting entry flags, entry might have been previously a delete
    * marker */
-  entry.flags = (entry.key.instance.empty() ?
-		 0 :
-		 rgw_bucket_dir_entry::FLAG_VER);
+  entry.flags &= rgw_bucket_dir_entry::FLAG_VER;
 
   if (op.tag.size()) {
     map<string, rgw_bucket_pending_info>::iterator pinter = entry.pending_map.find(op.tag);