From 968cfc8f1bcf048987fdfa52c32b706b9ba6ae86 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 22 Dec 2008 13:42:12 -0800 Subject: [PATCH] mds: add safe flag to mds reply --- src/include/ceph_fs.h | 1 + src/messages/MClientReply.h | 9 ++++++--- src/messages/MClientRequest.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 1dc1ad14b5664..16051c5d7aeba 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -823,6 +823,7 @@ struct ceph_mds_reply_head { __le32 file_caps_seq; __le32 file_caps_mseq; __le32 mdsmap_epoch; + __u8 safe; } __attribute__ ((packed)); /* one for each node split */ diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h index c31998ee923dd..e50a0855140c0 100644 --- a/src/messages/MClientReply.h +++ b/src/messages/MClientReply.h @@ -194,9 +194,10 @@ public: MClientReply(MClientRequest *req, int result = 0) : Message(CEPH_MSG_CLIENT_REPLY) { memset(&st, 0, sizeof(st)); - this->st.tid = req->get_tid(); - this->st.op = req->get_op(); - this->st.result = result; + st.tid = req->get_tid(); + st.op = req->get_op(); + st.result = result; + st.safe = 1; } const char *get_type_name() { return "creply"; } void print(ostream& o) { @@ -204,6 +205,8 @@ public: o << " = " << get_result(); if (get_result() <= 0) o << " " << strerror(-get_result()); + if (st.safe) + o << " safe"; o << ")"; } diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index 0425d9892f9a7..304a4701f1305 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -63,7 +63,7 @@ public: MClientRequest() : Message(CEPH_MSG_CLIENT_REQUEST) {} MClientRequest(int op) : Message(CEPH_MSG_CLIENT_REQUEST) { memset(&head, 0, sizeof(head)); - this->head.op = op; + head.op = op; } void set_mdsmap_epoch(epoch_t e) { head.mdsmap_epoch = e; } -- 2.39.5