Merge branch 'main' of https://github.com/ceph/ceph into update-ceph-mgw

Signed-off-by: Dattaprasad Govekar <dattaprasad.govekar@seagate.com>

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_sal_motr.cc
Simple merge

diff --cc src/rgw/rgw_sal_motr.h
index 0c74e0a50597e8c570b38812e4d565205aea8409,f90eb6d9890014fd24c2a16fb5a04e796f72c935..17f726117e132babb393de4b2b9838de17c65cc0
--- 1/src/rgw/rgw_sal_motr.h
--- 2/src/rgw/rgw_sal_motr.h
+++ b/src/rgw/rgw_sal_motr.h
@@@ -138,61 -135,10 +138,61 @@@ struct MotrUserInfo 
  };
  WRITE_CLASS_ENCODER(MotrUserInfo);
  
- class MotrNotification : public Notification {
 +struct MotrEmailInfo {
 +  std::string user_id;
 +  std::string email_id;
 +
 +  MotrEmailInfo() {}
 +  MotrEmailInfo(std::string _user_id, std::string _email_id )
 +    : user_id(std::move(_user_id)), email_id(std::move(_email_id)) {}
 +
 +  void encode(bufferlist& bl) const {
 +    ENCODE_START(2, 2, bl);
 +    encode(user_id, bl);
 +    encode(email_id, bl);
 +    ENCODE_FINISH(bl);
 +  }
 +
 +  void decode(bufferlist::const_iterator& bl) {
 +     DECODE_START_LEGACY_COMPAT_LEN_32(2, 2, 2, bl);
 +     decode(user_id, bl);
 +     decode(email_id, bl);
 +      DECODE_FINISH(bl);
 +  }
 +};
 +WRITE_CLASS_ENCODER(MotrEmailInfo);
 +
 +struct MotrAccessKey {
 +  std::string id; // AccessKey
 +  std::string key; // SecretKey
 +  std::string user_id; // UserID
 +  
 +  MotrAccessKey() {}
 +  MotrAccessKey(std::string _id, std::string _key, std::string _user_id)
 +    : id(std::move(_id)), key(std::move(_key)), user_id(std::move(_user_id)) {}
 +
 +  void encode(bufferlist& bl) const {
 +    ENCODE_START(2, 2, bl);
 +    encode(id, bl);
 +    encode(key, bl);
 +    encode(user_id, bl);
 +    ENCODE_FINISH(bl);
 +  }
 +
 +  void decode(bufferlist::const_iterator& bl) {
 +     DECODE_START_LEGACY_COMPAT_LEN_32(2, 2, 2, bl);
 +     decode(id, bl);
 +     decode(key, bl);
 +     decode(user_id, bl);
 +     DECODE_FINISH(bl);
 +  }
 +};
 +WRITE_CLASS_ENCODER(MotrAccessKey);
 +
+ class MotrNotification : public StoreNotification {
    public:
      MotrNotification(Object* _obj, Object* _src_obj, rgw::notify::EventType _type) :
-         Notification(_obj, _src_obj, _type) {}
+         StoreNotification(_obj, _src_obj, _type) {}
      ~MotrNotification() = default;
  
      virtual int publish_reserve(const DoutPrefixProvider *dpp, RGWObjTags* obj_tags = nullptr) override { return 0;}
@@@ -207,9 -153,8 +207,9 @@@ class MotrUser : public StoreUser 
      struct m0_idx      idx;
  
    public:
-     MotrUser(MotrStore *_st, const rgw_user& _u) : User(_u), store(_st) { }
-     MotrUser(MotrStore *_st, const RGWUserInfo& _i) : User(_i), store(_st) { }
 +    std::set<std::string> access_key_tracker;
+     MotrUser(MotrStore *_st, const rgw_user& _u) : StoreUser(_u), store(_st) { }
+     MotrUser(MotrStore *_st, const RGWUserInfo& _i) : StoreUser(_i), store(_st) { }
      MotrUser(MotrStore *_st) : store(_st) { }
      MotrUser(MotrUser& _o) = default;
      MotrUser() {}