From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 3 May 2017 21:53:33 +0000 (-0700)
Subject: rgw: use RGW_AMZ_META_PREFIX
X-Git-Tag: ses5-milestone6~9^2~3^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e4e74329d1381b20fdfc6550fc55b2523b49a70;p=ceph.git

rgw: use RGW_AMZ_META_PREFIX

instead of defining X_AMZ_META_PREFIX

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index a948cf1548f..5cc5a43a475 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2748,14 +2748,13 @@ int RGWConfigBucketMetaSearch_ObjStore_S3::get_params()
       val = boost::algorithm::to_lower_copy(rgw_trim_whitespace(args[1]));
     }
 
-#define X_AMZ_META_PREFIX "x-amz-meta-"
-    if (!boost::algorithm::starts_with(key, X_AMZ_META_PREFIX)) {
-      s->err.message = string("invalid expression, key must start with '" X_AMZ_META_PREFIX "' : ") + expression;
+    if (!boost::algorithm::starts_with(key, RGW_AMZ_META_PREFIX)) {
+      s->err.message = string("invalid expression, key must start with '" RGW_AMZ_META_PREFIX "' : ") + expression;
       ldout(s->cct, 20) << s->err.message << dendl;
       return -EINVAL;
     }
 
-    key = key.substr(sizeof(X_AMZ_META_PREFIX) - 1);
+    key = key.substr(sizeof(RGW_AMZ_META_PREFIX) - 1);
 
     ESEntityTypeMap::EntityType entity_type;