]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix POOL_OP_AUID_CHANGE
authorSage Weil <sage@inktank.com>
Tue, 4 Jun 2013 01:19:29 +0000 (18:19 -0700)
committerDan Mick <dan.mick@inktank.com>
Tue, 4 Jun 2013 04:07:17 +0000 (21:07 -0700)
Signed-off-by: Sage Weil <sage@inktank.com>
src/mon/OSDMonitor.cc

index f2fab84191f52ea452cb3c3fcee081d706f1bacf..335076a016315427aa66021aecdc87699476dc69 100644 (file)
@@ -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;