From: Sage Weil <sage@redhat.com>
Date: Sat, 11 Aug 2018 18:56:51 +0000 (-0500)
Subject: messages/MPoolOp: drop auid member
X-Git-Tag: v14.0.1~431^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fd2e0bc43215abbce644220f3ec7571775f58a3;p=ceph.git

messages/MPoolOp: drop auid member

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index e18ef55da57..d3db9119ce7 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -30,7 +30,6 @@ public:
   __u32 pool = 0;
   string name;
   __u32 op = 0;
-  uint64_t auid = 0;
   snapid_t snapid;
   __s16 crush_rule = 0;
 
@@ -39,14 +38,7 @@ public:
   MPoolOp(const uuid_d& f, ceph_tid_t t, int p, string& n, int o, version_t v)
     : MessageInstance(CEPH_MSG_POOLOP, v, HEAD_VERSION, COMPAT_VERSION),
       fsid(f), pool(p), name(n), op(o),
-      auid(0), snapid(0), crush_rule(0) {
-    set_tid(t);
-  }
-  MPoolOp(const uuid_d& f, ceph_tid_t t, int p, string& n,
-	  int o, uint64_t uid, version_t v)
-    : MessageInstance(CEPH_MSG_POOLOP, v, HEAD_VERSION, COMPAT_VERSION),
-      fsid(f), pool(p), name(n), op(o),
-      auid(uid), snapid(0), crush_rule(0) {
+      snapid(0), crush_rule(0) {
     set_tid(t);
   }
 
@@ -57,7 +49,6 @@ public:
   const char *get_type_name() const override { return "poolop"; }
   void print(ostream& out) const override {
     out << "pool_op(" << ceph_pool_op_name(op) << " pool " << pool
-	<< " auid " << auid
 	<< " tid " << get_tid()
 	<< " name " << name
 	<< " v" << version << ")";
@@ -69,7 +60,7 @@ public:
     encode(fsid, payload);
     encode(pool, payload);
     encode(op, payload);
-    encode(auid, payload);
+    encode((uint64_t)0, payload);
     encode(snapid, payload);
     encode(name, payload);
     __u8 pad = 0;
@@ -84,7 +75,8 @@ public:
     if (header.version < 2)
       decode(name, p);
     decode(op, p);
-    decode(auid, p);
+    uint64_t old_auid;
+    decode(old_auid, p);
     decode(snapid, p);
     if (header.version >= 2)
       decode(name, p);
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 8cde68a937f..44d2675e7d3 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -4007,7 +4007,7 @@ void Objecter::_pool_op_submit(PoolOp *op)
   ldout(cct, 10) << "pool_op_submit " << op->tid << dendl;
   MPoolOp *m = new MPoolOp(monc->get_fsid(), op->tid, op->pool,
 			   op->name, op->pool_op,
-			   op->auid, last_seen_osdmap_version);
+			   last_seen_osdmap_version);
   if (op->snapid) m->snapid = op->snapid;
   if (op->crush_rule) m->crush_rule = op->crush_rule;
   monc->send_mon_message(m);
@@ -4613,7 +4613,6 @@ void Objecter::dump_pool_ops(Formatter *fmt) const
     fmt->dump_int("pool", op->pool);
     fmt->dump_string("name", op->name);
     fmt->dump_int("operation_type", op->pool_op);
-    fmt->dump_unsigned("auid", op->auid);
     fmt->dump_unsigned("crush_rule", op->crush_rule);
     fmt->dump_stream("snapid") << op->snapid;
     fmt->dump_stream("last_sent") << op->last_submit;
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 7cd6d90a9d9..8d215b91ada 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1597,14 +1597,13 @@ public:
     Context *onfinish;
     uint64_t ontimeout;
     int pool_op;
-    uint64_t auid;
     int16_t crush_rule;
     snapid_t snapid;
     bufferlist *blp;
 
     ceph::coarse_mono_time last_submit;
     PoolOp() : tid(0), pool(0), onfinish(NULL), ontimeout(0), pool_op(0),
-	       auid(0), crush_rule(0), snapid(0), blp(NULL) {}
+	       crush_rule(0), snapid(0), blp(NULL) {}
   };
 
   // -- osd commands --