From: Sage Weil <sage@redhat.com>
Date: Tue, 9 Jan 2018 19:56:36 +0000 (-0600)
Subject: osd/PG: drop PGPool auid member
X-Git-Tag: v13.0.2~510^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c35ee7abf5f26d15b9d09ec9d329c60f3d60608d;p=ceph.git

osd/PG: drop PGPool auid member

It's at info.auid.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 25e5e34fdf92..a976c5501fdf 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -231,7 +231,6 @@ void PGPool::update(CephContext *cct, OSDMapRef map)
     return; // pool has been deleted
   }
   info = *pi;
-  auid = pi->auid;
   name = map->get_pool_name(id);
 
   bool updated = false;
@@ -1929,7 +1928,7 @@ bool PG::op_has_sufficient_caps(OpRequestRef& op)
     req->get_hobj().get_key();
 
   bool cap = caps.is_capable(pool.name, req->get_hobj().nspace,
-                             pool.auid,
+                             pool.info.auid,
 			     pool.info.application_metadata,
 			     key,
 			     op->need_read_cap(),
@@ -1940,7 +1939,7 @@ bool PG::op_has_sufficient_caps(OpRequestRef& op)
            << "session=" << session
            << " pool=" << pool.id << " (" << pool.name
            << " " << req->get_hobj().nspace
-	   << ") owner=" << pool.auid
+	   << ") owner=" << pool.info.auid
 	   << " pool_app_metadata=" << pool.info.application_metadata
 	   << " need_read_cap=" << op->need_read_cap()
 	   << " need_write_cap=" << op->need_write_cap()
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 13e853b47edd..48096dfcc225 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -217,7 +217,6 @@ struct PGPool {
   epoch_t cached_epoch;
   int64_t id;
   string name;
-  uint64_t auid;
 
   pg_pool_t info;      
   SnapContext snapc;   // the default pool snapc, ready to go.
@@ -230,8 +229,7 @@ struct PGPool {
     : cct(cct),
       cached_epoch(map->get_epoch()),
       id(i),
-      name(map->get_pool_name(id)),
-      auid(map->get_pg_pool(id)->auid) {
+      name(map->get_pool_name(id)) {
     const pg_pool_t *pi = map->get_pg_pool(id);
     if (pi) {
       info = *pi;