From f8248e5ee0652c8997d7cfbeec50d7a7ac5464e5 Mon Sep 17 00:00:00 2001 From: Dattaprasad Govekar Date: Sun, 26 Jun 2022 23:24:05 -0600 Subject: [PATCH] Updated with latest ceph/main Fixed compilation issue in src/rgw/rgw_sal_motr.h. Signed-off-by: Dattaprasad Govekar --- ceph-erasure-code-corpus | 2 +- src/blkin | 2 +- src/crypto/isa-l/isa-l_crypto | 2 +- src/erasure-code/jerasure/gf-complete | 2 +- src/erasure-code/jerasure/jerasure | 2 +- src/isa-l | 2 +- src/libkmip | 2 +- src/rgw/rgw_sal_motr.h | 5 ++--- src/rocksdb | 2 +- src/s3select | 2 +- src/utf8proc | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ceph-erasure-code-corpus b/ceph-erasure-code-corpus index 2d7d78b9cc52..ec6b7303cfb3 160000 --- a/ceph-erasure-code-corpus +++ b/ceph-erasure-code-corpus @@ -1 +1 @@ -Subproject commit 2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7 +Subproject commit ec6b7303cfb36822f91d719351e4637083fa28c1 diff --git a/src/blkin b/src/blkin index f24ceec055ea..f73d3ffeb78e 160000 --- a/src/blkin +++ b/src/blkin @@ -1 +1 @@ -Subproject commit f24ceec055ea236a093988237a9821d145f5f7c8 +Subproject commit f73d3ffeb78eef9c228f101f6f8319f728b401ac diff --git a/src/crypto/isa-l/isa-l_crypto b/src/crypto/isa-l/isa-l_crypto index 603529a4e06a..ecad4d3d5003 160000 --- a/src/crypto/isa-l/isa-l_crypto +++ b/src/crypto/isa-l/isa-l_crypto @@ -1 +1 @@ -Subproject commit 603529a4e06ac8a1662c13d6b31f122e21830352 +Subproject commit ecad4d3d5003883a9edcc0996f025adc34bb2ade diff --git a/src/erasure-code/jerasure/gf-complete b/src/erasure-code/jerasure/gf-complete index 7e61b44404f0..a6862d10c9db 160000 --- a/src/erasure-code/jerasure/gf-complete +++ b/src/erasure-code/jerasure/gf-complete @@ -1 +1 @@ -Subproject commit 7e61b44404f0ed410c83cfd3947a52e88ae044e1 +Subproject commit a6862d10c9db467148f20eef2c6445ac9afd94d8 diff --git a/src/erasure-code/jerasure/jerasure b/src/erasure-code/jerasure/jerasure index 96c76b89d661..de1739cc8483 160000 --- a/src/erasure-code/jerasure/jerasure +++ b/src/erasure-code/jerasure/jerasure @@ -1 +1 @@ -Subproject commit 96c76b89d661c163f65a014b8042c9354ccf7f31 +Subproject commit de1739cc8483696506829b52e7fda4f6bb195e6a diff --git a/src/isa-l b/src/isa-l index bee5180a1517..1db0363c4967 160000 --- a/src/isa-l +++ b/src/isa-l @@ -1 +1 @@ -Subproject commit bee5180a1517f8b5e70b02fcd66790c623536c5d +Subproject commit 1db0363c49679494fc9a22aab08255f8017e00a8 diff --git a/src/libkmip b/src/libkmip index b25cde94c9b8..4f553ecaf8e5 160000 --- a/src/libkmip +++ b/src/libkmip @@ -1 +1 @@ -Subproject commit b25cde94c9b8686988ed1236bd807afe74991333 +Subproject commit 4f553ecaf8e57cc3019222b8551d17888f0a1e66 diff --git a/src/rgw/rgw_sal_motr.h b/src/rgw/rgw_sal_motr.h index 35fa92a60665..0c74e0a50597 100644 --- a/src/rgw/rgw_sal_motr.h +++ b/src/rgw/rgw_sal_motr.h @@ -489,10 +489,9 @@ class MotrZone : public Zone { } MotrZone(MotrStore* _store, MotrZoneGroup _zg) : store(_store), zonegroup(_zg) { realm = new RGWRealm(); - zonegroup = new RGWZoneGroup(); // TODO: fetch zonegroup params (eg. id) from provisioner config. - zonegroup->set_id("0956b174-fe14-4f97-8b50-bb7ec5e1cf62"); - zonegroup->api_name = "default"; + zonegroup.set_id("0956b174-fe14-4f97-8b50-bb7ec5e1cf62"); + zonegroup.api_name = "default"; zone_public_config = new RGWZone(); zone_params = new RGWZoneParams(); current_period = new RGWPeriod(); diff --git a/src/rocksdb b/src/rocksdb index c540de6f709b..bc7e8d472e7d 160000 --- a/src/rocksdb +++ b/src/rocksdb @@ -1 +1 @@ -Subproject commit c540de6f709b66efd41436694f72d6f7986a325b +Subproject commit bc7e8d472e7d37a33f3f45dec393769011ec1e08 diff --git a/src/s3select b/src/s3select index 825598ac92df..fe5f7e14d14e 160000 --- a/src/s3select +++ b/src/s3select @@ -1 +1 @@ -Subproject commit 825598ac92dfb889a2107b85d461e9e673838450 +Subproject commit fe5f7e14d14ef2f6dec30b82552452d2ddbeb3ce diff --git a/src/utf8proc b/src/utf8proc index 97ef668b312b..63f31c908ef7 160000 --- a/src/utf8proc +++ b/src/utf8proc @@ -1 +1 @@ -Subproject commit 97ef668b312b96382714dbb8eaac4affce0816e6 +Subproject commit 63f31c908ef7656415f73d6c178f08181239f74c -- 2.47.3