msg: Add space for snapid in MPoolOp. Reply now uses an int64_t replyCode.

This allows space for a full 64-bit snapid to be returned, which is about
to be necessary.

diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index 9965e7980fc29ba920f4a356680ab2fa7c8d998a..55605eaf4501b9e02aee6aebddf49208e41bd460 100644 (file)
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -23,6 +23,8 @@ enum {
   POOL_OP_DELETE,
   POOL_OP_CREATE_SNAP,
   POOL_OP_DELETE_SNAP,
+  POOL_OP_CREATE_UNMANAGED_SNAP,
+  POOL_OP_DELETE_UNMANAGED_SNAP,
   POOL_OP_AUID_CHANGE
 };
 
@@ -50,17 +52,18 @@ public:
   string name;
   int op;
   __u64 auid;
+  snapid_t snapid;
 
   MPoolOp() : PaxosServiceMessage(MSG_POOLOP, 0) {}
   MPoolOp(const ceph_fsid_t& f, tid_t t, int p, string& n, int o, version_t v) :
     PaxosServiceMessage(MSG_POOLOP, v), fsid(f), pool(p), name(n), op(o),
-    auid(0) {
+    auid(0), snapid(0) {
     set_tid(t);
   }
   MPoolOp(const ceph_fsid_t& f, tid_t t, int p, string& n,
          int o, __u64 uid, version_t v) :
     PaxosServiceMessage(MSG_POOLOP, v), fsid(f), pool(p), name(n), op(o),
-    auid(uid) {
+    auid(uid), snapid(0) {
     set_tid(t);
   }
 
@@ -79,6 +82,7 @@ public:
     ::encode(name, payload);
     ::encode(op, payload);
     ::encode(auid, payload);
+    ::encode(snapid, payload);
   }
   void decode_payload() {
     bufferlist::iterator p = payload.begin();
@@ -88,6 +92,7 @@ public:
     ::decode(name, p);
     ::decode(op, p);
     ::decode(auid, p);
+    ::decode(snapid, p);
   }
 };
 

diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h
index d6f93d70ccda87f1b35132a143ce54cef1d05978..668dfbb4f59d96b9baabc2a9bc1634d0839344f5 100644 (file)
--- a/src/messages/MPoolOpReply.h
+++ b/src/messages/MPoolOpReply.h
@@ -22,7 +22,6 @@ public:
   int replyCode;
   epoch_t epoch;
 
-
   MPoolOpReply() : PaxosServiceMessage(MSG_POOLOPREPLY, 0) {}
   MPoolOpReply( ceph_fsid_t& f, tid_t t, int rc, int e, version_t v) :
     PaxosServiceMessage(MSG_POOLOPREPLY, v), fsid(f), replyCode(rc), epoch(e) {