From f1dfd64f72e8366347ec07dedc889f687c1b37b7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Dec 2012 13:18:50 -0800 Subject: [PATCH] messages/MOSDOpReply: remove misleading may_read/may_write These are OpRequest properties, calculated/enforced at the OSD. They don't belong in the MOSDOp or MOSDOpReply messages. Signed-off-by: Sage Weil --- src/messages/MOSDOpReply.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index 9f47e5db95c99..65f7b23987cde 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -54,9 +54,6 @@ public: int get_result() const { return result; } eversion_t get_version() { return reassert_version; } - bool may_read() const { return flags & CEPH_OSD_FLAG_READ; } - bool may_write() const { return flags & CEPH_OSD_FLAG_WRITE; } - void set_result(int r) { result = r; } void set_version(eversion_t v) { reassert_version = v; } @@ -200,14 +197,12 @@ public: void print(ostream& out) const { out << "osd_op_reply(" << get_tid() << " " << oid << " " << ops; - if (may_write()) { - if (is_ondisk()) - out << " ondisk"; - else if (is_onnvram()) - out << " onnvram"; - else - out << " ack"; - } + if (is_ondisk()) + out << " ondisk"; + else if (is_onnvram()) + out << " onnvram"; + else + out << " ack"; out << " = " << get_result(); if (get_result() < 0) { char buf[80]; -- 2.47.3