From 0d0e7c2192d09673cc5091f49921dbf9387f8208 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 11 Aug 2018 11:52:25 -0500 Subject: [PATCH] osdc/Objecter: do not pass auid to create_pool Signed-off-by: Sage Weil --- src/librados/RadosClient.cc | 4 ++-- src/osdc/Objecter.cc | 3 +-- src/osdc/Objecter.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 58c24c42f25c1..6ad5d3780a027 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -720,7 +720,7 @@ int librados::RadosClient::pool_create(string& name, unsigned long long auid, Cond cond; bool done; Context *onfinish = new C_SafeCond(&mylock, &cond, &done, &reply); - reply = objecter->create_pool(name, onfinish, auid, crush_rule); + reply = objecter->create_pool(name, onfinish, crush_rule); if (reply < 0) { delete onfinish; @@ -742,7 +742,7 @@ int librados::RadosClient::pool_create_async(string& name, PoolAsyncCompletionIm return r; Context *onfinish = new C_PoolAsync_Safe(c); - r = objecter->create_pool(name, onfinish, auid, crush_rule); + r = objecter->create_pool(name, onfinish, crush_rule); if (r < 0) { delete onfinish; } diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index ff7db68156fcd..1a804de9c83a3 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -3927,7 +3927,7 @@ int Objecter::delete_selfmanaged_snap(int64_t pool, snapid_t snap, return 0; } -int Objecter::create_pool(string& name, Context *onfinish, uint64_t auid, +int Objecter::create_pool(string& name, Context *onfinish, int crush_rule) { unique_lock wl(rwlock); @@ -3945,7 +3945,6 @@ int Objecter::create_pool(string& name, Context *onfinish, uint64_t auid, op->onfinish = onfinish; op->pool_op = POOL_OP_CREATE; pool_ops[op->tid] = op; - op->auid = auid; op->crush_rule = crush_rule; pool_op_submit(op); diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 80673c6a77223..a31ad28b1da17 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -2934,7 +2934,7 @@ public: int delete_pool_snap(int64_t pool, string& snapName, Context *onfinish); int delete_selfmanaged_snap(int64_t pool, snapid_t snap, Context *onfinish); - int create_pool(string& name, Context *onfinish, uint64_t auid=0, + int create_pool(string& name, Context *onfinish, int crush_rule=-1); int delete_pool(int64_t pool, Context *onfinish); int delete_pool(const string& name, Context *onfinish); -- 2.39.5