auth: rename auth_uid -> auid

diff --git a/src/include/rados.h b/src/include/rados.h
index b3e8dbef401201fcc1700f5d4d4b4b00ce8a3274..41b777fef62c0d3fed8f5cf089b94cde4e10f18c 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -99,7 +99,7 @@ struct ceph_pg_pool {
        __le32 snap_epoch;        /* epoch of last snap */
        __le32 num_snaps;
        __le32 num_removed_snap_intervals;
-       __le64 auth_uid;               /* who owns the pg */
+       __le64 auid;               /* who owns the pg */
 } __attribute__ ((packed));
 
 /*

diff --git a/src/osd/OSDCaps.cc b/src/osd/OSDCaps.cc
index 74fe4f3f68d6aee29febc4d6626c15f1e3cd4ec8..ce5bff2f0cdf037ce28e369f7ddca2682219d844 100644 (file)
--- a/src/osd/OSDCaps.cc
+++ b/src/osd/OSDCaps.cc
@@ -176,7 +176,7 @@ int OSDCaps::get_pool_cap(int pool_id, __u64 uid)
     cap |= c.allow;
     cap &= ~c.deny;
   } else if (  uid != CEPH_AUTH_UID_DEFAULT
-            && uid == auth_uid) {
+            && uid == auid) {
     //the owner has full access unless they've removed some by setting
     //new caps
     cap = OSD_POOL_CAP_ALL;

diff --git a/src/osd/OSDCaps.h b/src/osd/OSDCaps.h
index 7b19b86d7bdb1044aec14e3b398563c444c3bdcb..d4ffcfd652fee859332ffb4757e0a92dd085fa55 100644 (file)
--- a/src/osd/OSDCaps.h
+++ b/src/osd/OSDCaps.h
@@ -53,17 +53,17 @@ struct OSDCaps {
   map<int, OSDPoolCap> pools_map;
   rwx_t default_action;
   bool allow_all;
-  __u64 auth_uid;
+  __u64 auid;
 
   bool get_next_token(string s, size_t& pos, string& token);
   bool is_rwx(string& token, rwx_t& cap_val);
   
   OSDCaps() : default_action(0), allow_all(false),
-             auth_uid(CEPH_AUTH_UID_DEFAULT) {}
+             auid(CEPH_AUTH_UID_DEFAULT) {}
   bool parse(bufferlist::iterator& iter);
   int get_pool_cap(int pool_id, __u64 uid = CEPH_AUTH_UID_DEFAULT);
   void set_allow_all(bool allow) { allow_all = allow; }
-  void set_auth_uid(__u64 uid) { auth_uid = uid; }
+  void set_auid(__u64 uid) { auid = uid; }
 };
 
 static inline ostream& operator<<(ostream& out, const OSDCaps& c) {