From b972a35f66fd0d4786a175108c7e42181c84f78c Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 28 Jan 2020 10:34:02 -0800 Subject: [PATCH] rgw: fix compilation after rebase Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 4d0c382d804..ca57f56f2db 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -5501,10 +5501,11 @@ int main(int argc, const char **argv) else if (opt_cmd == OPT::USER_SUSPEND) user_op.set_suspension(true); - if (!placement_id.empty() || !storage_class.empty()) { + if (!placement_id.empty() || + (opt_storage_class && !opt_storage_class->empty())) { rgw_placement_rule target_rule; target_rule.name = placement_id; - target_rule.storage_class = storage_class; + target_rule.storage_class = *opt_storage_class; if (!store->svc()->zone->get_zone_params().valid_placement(target_rule)) { cerr << "NOTICE: invalid dest placement: " << target_rule.to_str() << std::endl; return EINVAL; -- 2.39.5