mds: move auth_pins attrs into MDSCacheObject

These were common between CInode, CDir, CDentry.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index c59059898f9249da052b5da9577090f40f6f8195..e45935c8decec9e6860e617fb449d4c50d82cebe 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -148,10 +148,6 @@ public:
   elist<CDentry*>::item item_stray;
 
 protected:
-  int auth_pins, nested_auth_pins;
-#ifdef MDS_AUTHPIN_SET
-  multiset<void*> auth_pin_set;
-#endif
   friend class Migrator;
   friend class Locker;
   friend class MDCache;
@@ -176,7 +172,6 @@ public:
     dir(0),
     version(0), projected_version(0),
     item_dirty(this),
-    auth_pins(0), nested_auth_pins(0),
     lock(this, &lock_type),
     versionlock(this, &versionlock_type) {
     g_num_dn++;
@@ -189,7 +184,6 @@ public:
     dir(0),
     version(0), projected_version(0),
     item_dirty(this),
-    auth_pins(0), nested_auth_pins(0),
     lock(this, &lock_type),
     versionlock(this, &versionlock_type) {
     g_num_dn++;
@@ -263,10 +257,7 @@ public:
   void adjust_nested_auth_pins(int adjustment, int diradj, void *by);
   bool is_frozen() const;
   bool is_freezing() const;
-  bool is_auth_pinned() const { return auth_pins || nested_auth_pins; }
-  int get_num_auth_pins() const { return auth_pins; }
   int get_num_dir_auth_pins() const;
-  int get_num_nested_auth_pins() const { return nested_auth_pins; }
   
   // remote links
   void link_remote(linkage_t *dnl, CInode *in);

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index adf77f354f3fb36edfdf231975bce7b1aa14f867..3b874dd7a9a61c0dacda432bcaa104fa7a6ee938 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -221,8 +221,6 @@ CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
   if (auth) 
     state |= STATE_AUTH;
  
-  auth_pins = 0;
-  nested_auth_pins = 0;
   dir_auth_pins = 0;
   request_pins = 0;
 

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index f5ebc7b9e55d60f0bd770d387c11b1944fb00f06..d12b31845b86062c6360ac1a0c49d5f39267bd07 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -253,11 +253,7 @@ protected:
   static int num_frozen_trees;
   static int num_freezing_trees;
 
-  int auth_pins;
-#ifdef MDS_AUTHPIN_SET
-  multiset<void*> auth_pin_set;
-#endif
-  int nested_auth_pins, dir_auth_pins;
+  int dir_auth_pins;
   int request_pins;
 
   // cache control  (defined for authority; hints for replicas)
@@ -540,7 +536,6 @@ public:
     if (request_pins == 0) put(PIN_REQUEST);
   }
 
-    
   // -- waiters --
 protected:
   compact_map< string_snap_t, std::list<MDSInternalContextBase*> > waiting_on_dentry;
@@ -566,7 +561,6 @@ public:
   }
   void decode_import(bufferlist::iterator& blp, utime_t now, LogSegment *ls);
 
-
   // -- auth pins --
   bool can_auth_pin() const { return is_auth() && !(is_frozen() || is_freezing()); }
   int get_cum_auth_pins() const { return auth_pins + nested_auth_pins; }

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index e30e0c268c872944026ba66ffcd973941452908d..abbf1b3c793c92d3cce9c026793803668f3cb7f8 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -511,14 +511,7 @@ public:
   elist<CInode*>::item item_dirty_dirfrag_nest;
   elist<CInode*>::item item_dirty_dirfrag_dirfragtree;
 
-private:
-  // auth pin
-  int auth_pins;
-  int nested_auth_pins;
 public:
-#ifdef MDS_AUTHPIN_SET
-  multiset<void*> auth_pin_set;
-#endif
   int auth_pin_freeze_allowance;
 
   inode_load_vec_t pop;
@@ -549,7 +542,6 @@ public:
     item_dirty_dirfrag_dir(this), 
     item_dirty_dirfrag_nest(this), 
     item_dirty_dirfrag_dirfragtree(this), 
-    auth_pins(0), nested_auth_pins(0),
     auth_pin_freeze_allowance(0),
     pop(ceph_clock_now(g_ceph_context)),
     versionlock(this, &versionlock_type),
@@ -884,15 +876,10 @@ public:
   bool issued_caps_need_gather(SimpleLock *lock);
   void replicate_relax_locks();
 
-
   // -- authority --
   mds_authority_t authority() const;
 
-
   // -- auth pins --
-  bool is_auth_pinned() const { return auth_pins || nested_auth_pins; }
-  int get_num_auth_pins() const { return auth_pins; }
-  int get_num_nested_auth_pins() const { return nested_auth_pins; }
   void adjust_nested_auth_pins(int a, void *by);
   bool can_auth_pin() const;
   void auth_pin(void *by);

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 8c479dc87453055f5831ae886ef350ca26c61249..c2ca6050ff340d34563900d9cd7ba7ed145c534d 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -1281,7 +1281,9 @@ class MDSCacheObject {
   MDSCacheObject() :
     state(0), 
     ref(0),
-    replica_nonce(0) {}
+    auth_pins(0), nested_auth_pins(0),
+    replica_nonce(0)
+  {}
   virtual ~MDSCacheObject() {}
 
   // printing
@@ -1396,6 +1398,17 @@ protected:
 #endif
   }
 
+  protected:
+  int auth_pins;
+  int nested_auth_pins;
+#ifdef MDS_AUTHPIN_SET
+  multiset<void*> auth_pin_set;
+#endif
+
+  public:
+  bool is_auth_pinned() const { return auth_pins || nested_auth_pins; }
+  int get_num_auth_pins() const { return auth_pins; }
+  int get_num_nested_auth_pins() const { return nested_auth_pins; }
 
   // --------------------------------------------
   // auth pins