Merge pull request #29559 from adamemerson/wip-putobj-crash

rgw: Move upload_info declaration out of conditional

Reviewed-By: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Adam C. Emerson 2019-08-08 15:14:03 -04:00
commit ad88d4dced

View File

@ -3788,10 +3788,10 @@ void RGWPutObj::execute()
rgw_placement_rule *pdest_placement;
multipart_upload_info upload_info;
if (multipart) {
RGWMPObj mp(s->object.name, multipart_upload_id);
multipart_upload_info upload_info;
op_ret = get_multipart_info(store, s, mp.get_meta(), nullptr, nullptr, &upload_info);
if (op_ret < 0) {
if (op_ret != -ENOENT) {