From: Sage Weil <sage@inktank.com>
Date: Fri, 7 Dec 2012 21:18:50 +0000 (-0800)
Subject: messages/MOSDOpReply: remove misleading may_read/may_write
X-Git-Tag: v0.57~282^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1dfd64f72e8366347ec07dedc889f687c1b37b7;p=ceph.git

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 <sage@inktank.com>
---

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 9f47e5db95c9..65f7b23987cd 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];