update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / osd / osd_op_util.cc

diff --git a/ceph/src/osd/osd_op_util.cc b/ceph/src/osd/osd_op_util.cc
index 626779843c76964474b18ec0f211f1c1ded57b9c..54c590ee2248ee9e842dd2b3ff770e37b14a75a4 100644 (file)
--- a/ceph/src/osd/osd_op_util.cc
+++ b/ceph/src/osd/osd_op_util.cc
@@ -6,6 +6,12 @@
 #include "osd/ClassHandler.h"
 #include "messages/MOSDOp.h"
 
+using std::ostream;
+using std::string;
+using std::vector;
+
+using ceph::bufferlist;
+
 bool OpInfo::check_rmw(int flag) const {
   ceph_assert(rmw_flags != 0);
   return rmw_flags & flag;
@@ -180,7 +186,7 @@ int OpInfo::set_from_op(
         if (is_promote)
           set_promote();
         add_class(std::move(cname), std::move(mname), is_read, is_write,
-                      cls->whitelisted);
+                      cls->allowed);
        break;
       }
 
@@ -252,6 +258,6 @@ int OpInfo::set_from_op(
 ostream& operator<<(ostream& out, const OpInfo::ClassInfo& i)
 {
   out << "class " << i.class_name << " method " << i.method_name
-      << " rd " << i.read << " wr " << i.write << " wl " << i.whitelisted;
+      << " rd " << i.read << " wr " << i.write << " allowed " << i.allowed;
   return out;
 }