OpRequest: move method implementations into cc

I need to remove the osd_types.h include.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 2ed7a23086f6e3cb267171432f4e72fc6fecf0a0..0730ce86577de386dd2548806b10e3eb73cca256 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -10,6 +10,7 @@
 #include "messages/MOSDOp.h"
 #include "messages/MOSDSubOp.h"
 #include "include/assert.h"
+#include "osd/osd_types.h"
 
 
 
@@ -57,3 +58,27 @@ void OpRequest::init_from_message()
     reqid = static_cast<MOSDSubOp*>(request)->reqid;
   }
 }
+
+bool OpRequest::check_rmw(int flag) {
+  return rmw_flags & flag;
+}
+bool OpRequest::may_read() { return need_read_cap() || need_class_read_cap(); }
+bool OpRequest::may_write() { return need_write_cap() || need_class_write_cap(); }
+bool OpRequest::includes_pg_op() { return check_rmw(CEPH_OSD_RMW_FLAG_PGOP); }
+bool OpRequest::need_read_cap() {
+  return check_rmw(CEPH_OSD_RMW_FLAG_READ);
+}
+bool OpRequest::need_write_cap() {
+  return check_rmw(CEPH_OSD_RMW_FLAG_WRITE);
+}
+bool OpRequest::need_class_read_cap() {
+  return check_rmw(CEPH_OSD_RMW_FLAG_CLASS_READ);
+}
+bool OpRequest::need_class_write_cap() {
+  return check_rmw(CEPH_OSD_RMW_FLAG_CLASS_WRITE);
+}
+void OpRequest::set_read() { rmw_flags |= CEPH_OSD_RMW_FLAG_READ; }
+void OpRequest::set_write() { rmw_flags |= CEPH_OSD_RMW_FLAG_WRITE; }
+void OpRequest::set_class_read() { rmw_flags |= CEPH_OSD_RMW_FLAG_CLASS_READ; }
+void OpRequest::set_class_write() { rmw_flags |= CEPH_OSD_RMW_FLAG_CLASS_WRITE; }
+void OpRequest::set_pg_op() { rmw_flags |= CEPH_OSD_RMW_FLAG_PGOP; }

diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 87571f58787f70b8fc1e58ceb86b1bff492dcec3..2493135776e52a99c43d7265806e5e6d8af961f2 100644 (file)
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -35,29 +35,19 @@ struct OpRequest : public TrackedOp {
   // rmw flags
   int rmw_flags;
 
-  bool check_rmw(int flag) {
-    return rmw_flags & flag;
-  }
-  bool may_read() { return need_read_cap() || need_class_read_cap(); }
-  bool may_write() { return need_write_cap() || need_class_write_cap(); }
-  bool includes_pg_op() { return check_rmw(CEPH_OSD_RMW_FLAG_PGOP); }
-  bool need_read_cap() {
-    return check_rmw(CEPH_OSD_RMW_FLAG_READ);
-  }
-  bool need_write_cap() {
-    return check_rmw(CEPH_OSD_RMW_FLAG_WRITE);
-  }
-  bool need_class_read_cap() {
-    return check_rmw(CEPH_OSD_RMW_FLAG_CLASS_READ);
-  }
-  bool need_class_write_cap() {
-    return check_rmw(CEPH_OSD_RMW_FLAG_CLASS_WRITE);
-  }
-  void set_read() { rmw_flags |= CEPH_OSD_RMW_FLAG_READ; }
-  void set_write() { rmw_flags |= CEPH_OSD_RMW_FLAG_WRITE; }
-  void set_class_read() { rmw_flags |= CEPH_OSD_RMW_FLAG_CLASS_READ; }
-  void set_class_write() { rmw_flags |= CEPH_OSD_RMW_FLAG_CLASS_WRITE; }
-  void set_pg_op() { rmw_flags |= CEPH_OSD_RMW_FLAG_PGOP; }
+  bool check_rmw(int flag);
+  bool may_read();
+  bool may_write();
+  bool includes_pg_op();
+  bool need_read_cap();
+  bool need_write_cap();
+  bool need_class_read_cap();
+  bool need_class_write_cap();
+  void set_read();
+  void set_write();
+  void set_class_read();
+  void set_class_write();
+  void set_pg_op();
 
   void _dump(utime_t now, Formatter *f) const;