]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement" 20171/head
authorMatt Benjamin <mbenjamin@redhat.com>
Mon, 29 Jan 2018 16:12:11 +0000 (11:12 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Mon, 29 Jan 2018 16:21:39 +0000 (11:21 -0500)
This reverts commit 5e0bea71b52f652a5cb6323cf56391ada215c80b.
Fixes: http://tracker.ceph.com/issues/22827
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.cc

index e6f16ec3706fd2390842416a743877b500770619..7ac7cefdd2edf36c6cc743d1beebc76086032915 100644 (file)
@@ -201,8 +201,6 @@ namespace rgw {
          if (req.matched) {
            /* we need rgw object's key name equal to file name, if
             * not return NULL */
-#if 0 /* original behavior which motivated FLAG_EXACT_MATCH
-       * no longer reproduces */
            if ((flags & RGWFileHandle::FLAG_EXACT_MATCH) &&
                !req.exact_matched) {
              lsubdout(get_context(), rgw, 15)
@@ -211,7 +209,6 @@ namespace rgw {
                << path << dendl;
              goto done;
            }
-#endif
            fhr = lookup_fh(parent, path,
                            RGWFileHandle::FLAG_CREATE|
                            ((req.is_dir) ?