more int size cleanup

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index 967a8d1fdd55b44869d85479938121bd1ea42f71..6805330e1fe5153aff5ed4c61b91978b9256a5ab 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -272,9 +272,9 @@ ostream& operator<<(ostream& out, CDentry& dn);
 
 class CDentryDiscover {
   string dname;
-  int    replica_nonce;
-  int    lockstate;
-  off_t  dir_offset;
+  __s32  replica_nonce;
+  __s32  lockstate;
+  __s64  dir_offset;
   inodeno_t remote_ino;
   unsigned char remote_d_type;
 

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index d4fe1383dbdfc3063f4bfa81a7538d17388a2ebd..1cac78f700454dd5a45b59b49d01a0bce085c924 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -493,9 +493,9 @@ public:
 
 class CDirDiscover {
   dirfrag_t dirfrag;
-  int       nonce;
-  int       dir_rep;
-  set<int>  rep_by;
+  __s32     nonce;
+  __s32     dir_rep;
+  set<__s32> rep_by;
 
  public:
   CDirDiscover() {}

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 82b7b5b5cd048deed7d8461290323b694d37b63d..4b98dee95d519a695f8b2a49fff1a04e2c72a33d 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -561,13 +561,13 @@ class CInodeDiscover {
   string     symlink;
   fragtree_t dirfragtree;
 
-  int        replica_nonce;
+  __s32        replica_nonce;
   
-  int        authlock_state;
-  int        linklock_state;
-  int        dirfragtreelock_state;
-  int        filelock_state;
-  int        dirlock_state;
+  __u32      authlock_state;
+  __u32      linklock_state;
+  __u32      dirfragtreelock_state;
+  __u32      filelock_state;
+  __u32      dirlock_state;
 
  public:
   CInodeDiscover() {}

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 2d9567a77fa64b737f81497780f3760a874f137f..deb6be5a1778e63f39eb8681290bad54744bc2d4 100644 (file)
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -44,7 +44,7 @@ inline string cap_string(int cap)
   return s;
 }
 
-typedef uint32_t capseq_t;
+typedef __u32 capseq_t;
 
 class CInode;
 
@@ -70,9 +70,9 @@ public:
 
 private:
   CInode *inode;
-  int wanted_caps;     // what the client wants (ideally)
+  __u32 wanted_caps;     // what the client wants (ideally)
   
-  map<capseq_t, int>  cap_history;  // seq -> cap, [last_recv,last_sent]
+  map<capseq_t, __u32>  cap_history;  // seq -> cap, [last_recv,last_sent]
   capseq_t last_sent, last_recv;
   capseq_t last_open;
   
@@ -128,7 +128,7 @@ public:
   // caps issued, potentially still in hands of client
   int issued() { 
     int c = 0;
-    for (map<capseq_t,int>::iterator p = cap_history.begin();
+    for (map<capseq_t,__u32>::iterator p = cap_history.begin();
         p != cap_history.end();
         p++) {
       c |= p->second;
@@ -207,7 +207,7 @@ public:
     assert(last_recv <= last_sent);
     assert(seq <= last_sent);
     while (!cap_history.empty()) {
-      map<capseq_t,int>::iterator p = cap_history.begin();
+      map<capseq_t,__u32>::iterator p = cap_history.begin();
 
       if (p->first > seq)
        break;

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 17d290f5d664dc2aaddf37582751e7d9c4fdac48..a4464514230129fe85519adce96b9400a0f92d24 100644 (file)
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -90,8 +90,8 @@ protected:
   int wait_offset;
 
   // lock state
-  int state;
-  set<int> gather_set;  // auth+rep.  >= 0 is mds, < 0 is client
+  __s32 state;
+  set<__s32> gather_set;  // auth+rep.  >= 0 is mds, < 0 is client
   int num_client_lease;
 
   // local state

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 7988052941fc7ebc81a7a59441493ba1c106c1eb..adacf86dfa88eebf20ff63926e25a0d1da70fe56 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -132,7 +132,7 @@ public:
     const static int BACKLOG = 2;
     const static int FULLLOG = 3;
 
-    int type;
+    __s32 type;
     eversion_t split, floor;
     Info::History history;
 
@@ -265,7 +265,7 @@ public:
       const static int CLONE = 2;  
       const static int DELETE = 3;
 
-      int        op;   // write, zero, trunc, remove
+      __s32      op;   // write, zero, trunc, remove
       object_t   oid;
       eversion_t version;