From: Daniel Gryniewicz <dang@redhat.com>
Date: Wed, 28 Oct 2020 13:01:06 +0000 (-0400)
Subject: RGW - Fix broken merge in #37774
X-Git-Tag: v16.1.0~743^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e47b71955d5378d19382552cda2783d91ed3cfb5;p=ceph.git

RGW - Fix broken merge in #37774

I messed up the merge in #37774 and somehow forgot to push a change.
This resulted it the flag being set on the wrong branch.  This fixes
that.

RHBZ#1845501

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
---

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index e5390b0da523..37592bb6b8cc 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -2034,8 +2034,8 @@ int rgw_lookup(struct rgw_fs *rgw_fs,
       enum rgw_fh_type fh_type = fh_type_of(flags);
 
       uint32_t sl_flags = (flags & RGW_LOOKUP_FLAG_RCB)
-	? RGWFileHandle::FLAG_NONE
-	: RGWFileHandle::FLAG_EXACT_MATCH | RGWFileHandle::FLAG_IN_CB;
+	? RGWFileHandle::FLAG_IN_CB
+	: RGWFileHandle::FLAG_EXACT_MATCH;
 
       bool fast_attrs= fs->get_context()->_conf->rgw_nfs_s3_fast_attrs;