71 lines
2.8 KiB
Diff
71 lines
2.8 KiB
Diff
--- ceph-20.2.0/src/common/Formatter.h.orig 2026-01-06 17:47:18.437014517 -0500
|
|
+++ ceph-20.2.0/src/common/Formatter.h 2026-01-06 17:47:53.015404074 -0500
|
|
@@ -12,6 +12,7 @@
|
|
#include <memory>
|
|
#include <vector>
|
|
#include <stdarg.h>
|
|
+#include <cstdint>
|
|
#include <sstream>
|
|
#include <map>
|
|
#include <vector>
|
|
--- ceph-20.2.0/src/mds/Locker.cc.orig 2026-01-07 10:34:12.731210930 -0500
|
|
+++ ceph-20.2.0/src/mds/Locker.cc 2026-01-07 10:34:35.627823155 -0500
|
|
@@ -4489,7 +4489,7 @@
|
|
dout(7) << "handle_client_lease client." << client << " renew on " << *dn
|
|
<< (!dn->lock.can_lease(client)?", revoking lease":"") << dendl;
|
|
if (dn->lock.can_lease(client)) {
|
|
- auto reply = make_message<MClientLease>(*m);
|
|
+ auto reply = ceph::make_message<MClientLease>(*m);
|
|
int pool = 1; // fixme.. do something smart!
|
|
reply->h.duration_ms = (int)(1000 * mdcache->client_lease_durations[pool]);
|
|
reply->h.seq = ++l->seq;
|
|
--- ceph-20.2.0/src/mds/Server.cc.orig 2026-01-07 11:27:13.532097596 -0500
|
|
+++ ceph-20.2.0/src/mds/Server.cc 2026-01-07 11:28:42.411581266 -0500
|
|
@@ -150,7 +150,7 @@
|
|
}
|
|
}
|
|
batch_reqs.clear();
|
|
- server->reply_client_request(mdr, make_message<MClientReply>(*mdr->client_request, r));
|
|
+ server->reply_client_request(mdr, ceph::make_message<MClientReply>(*mdr->client_request, r));
|
|
}
|
|
void print(std::ostream& o) const override {
|
|
o << "[batch front=" << *mdr << "]";
|
|
@@ -2142,7 +2142,7 @@
|
|
dout(20) << __func__ << ": batch head " << *mdr << dendl;
|
|
mdr->release_batch_op()->respond(r);
|
|
} else {
|
|
- reply_client_request(mdr, make_message<MClientReply>(*mdr->client_request, r));
|
|
+ reply_client_request(mdr, ceph::make_message<MClientReply>(*mdr->client_request, r));
|
|
}
|
|
} else if (mdr->internal_op > -1) {
|
|
dout(10) << __func__ << ": completing with result " << cpp_strerror(r) << " on internal " << *mdr << dendl;
|
|
@@ -2290,7 +2290,7 @@
|
|
}
|
|
|
|
|
|
- auto reply = make_message<MClientReply>(*req, 0);
|
|
+ auto reply = ceph::make_message<MClientReply>(*req, 0);
|
|
reply->set_unsafe();
|
|
|
|
// mark xlocks "done", indicating that we are exposing uncommitted changes.
|
|
@@ -2632,7 +2632,7 @@
|
|
req->get_op() != CEPH_MDS_OP_OPEN &&
|
|
req->get_op() != CEPH_MDS_OP_CREATE)) {
|
|
dout(5) << "already completed " << req->get_reqid() << dendl;
|
|
- auto reply = make_message<MClientReply>(*req, 0);
|
|
+ auto reply = ceph::make_message<MClientReply>(*req, 0);
|
|
if (created != inodeno_t()) {
|
|
bufferlist extra;
|
|
set_reply_extra_bl(req, created, extra);
|
|
--- ceph-20.2.0/src/mds/MDCache.cc.orig 2026-01-07 11:28:48.882470871 -0500
|
|
+++ ceph-20.2.0/src/mds/MDCache.cc 2026-01-07 11:29:12.405069562 -0500
|
|
@@ -10535,7 +10535,7 @@
|
|
|
|
|
|
CInode *cur = 0;
|
|
- auto reply = make_message<MDiscoverReply>(*dis);
|
|
+ auto reply = ceph::make_message<MDiscoverReply>(*dis);
|
|
|
|
snapid_t snapid = dis->get_snapid();
|
|
|