From cbe3d3f41b9520e84c40042c7f1fd958a8aee330 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Mon, 29 Jan 2018 11:12:11 -0500 Subject: [PATCH] Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement" This reverts commit 5e0bea71b52f652a5cb6323cf56391ada215c80b. Fixes: http://tracker.ceph.com/issues/22827 Signed-off-by: Matt Benjamin --- src/rgw/rgw_file.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc index e6f16ec3706f..7ac7cefdd2ed 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -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) ? -- 2.47.3