From: Sage Weil <sage@inktank.com>
Date: Tue, 4 Jun 2013 01:19:29 +0000 (-0700)
Subject: mon: fix POOL_OP_AUID_CHANGE
X-Git-Tag: v0.65~136^2^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21a1c4d39ca5e7c2ff63590eef3e1f134bfec9ec;p=ceph.git

mon: fix POOL_OP_AUID_CHANGE

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f2fab84191f5..335076a01631 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3597,8 +3597,7 @@ bool OSDMonitor::preprocess_pool_op_create(MPoolOp *m)
 bool OSDMonitor::prepare_pool_op(MPoolOp *m)
 {
   dout(10) << "prepare_pool_op " << *m << dendl;
-  if (m->op == POOL_OP_CREATE ||
-      m->op == POOL_OP_AUID_CHANGE) {
+  if (m->op == POOL_OP_CREATE) {
     return prepare_pool_op_create(m);
   } else if (m->op == POOL_OP_DELETE) {
     return prepare_pool_op_delete(m);
@@ -3669,6 +3668,13 @@ bool OSDMonitor::prepare_pool_op(MPoolOp *m)
     }
     break;
 
+  case POOL_OP_AUID_CHANGE:
+    if (pp.auid != m->auid) {
+      pp.auid = m->auid;
+      changed = true;
+    }
+    break;
+
   default:
     assert(0);
     break;