]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
RGW - Fix broken merge in #37774
authorDaniel Gryniewicz <dang@redhat.com>
Wed, 28 Oct 2020 13:01:06 +0000 (09:01 -0400)
committerDaniel Gryniewicz <dang@redhat.com>
Wed, 28 Oct 2020 15:49:58 +0000 (11:49 -0400)
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>
src/rgw/rgw_file.cc

index e5390b0da523eee65db45f3e924e129648ee5e42..37592bb6b8cc28404d77e9d4bc9e0ad0e58e250d 100644 (file)
@@ -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;