features is uint64_t

This won't bite us for a while yet (we're on bit 26), but it will soon!

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 58d4292333f9c8876497bf88e5e5b34bf7ba1d38..428ca7aa33b00f2bdf11f141e5ae662be721be6e 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -773,7 +773,7 @@ void Client::insert_readdir_results(MetaRequest *request, int mds, Inode *diri)
 
   MClientReply *reply = request->reply;
   Connection *con = request->reply->get_connection();
-  int features = con->get_features();
+  uint64_t features = con->get_features();
 
   assert(request->readdir_result.empty());
 
@@ -907,7 +907,7 @@ Inode* Client::insert_trace(MetaRequest *request, int mds)
   }
 
   Connection *con = request->reply->get_connection();
-  int features = con->get_features();
+  uint64_t features = con->get_features();
   ldout(cct, 10) << " features 0x" << hex << features << dec << dendl;
 
   // snap trace

diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 88f7576e01edbbadf210edd54aee9471e87310de..896245f34b8663c9683cd022e93712023b97805f 100644 (file)
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -124,11 +124,11 @@ struct InodeStat {
 
  public:
   InodeStat() {}
-  InodeStat(bufferlist::iterator& p, int features) {
+  InodeStat(bufferlist::iterator& p, uint64_t features) {
     decode(p, features);
   }
 
-  void decode(bufferlist::iterator &p, int features) {
+  void decode(bufferlist::iterator &p, uint64_t features) {
     struct ceph_mds_reply_inode e;
     ::decode(e, p);
     vino.ino = inodeno_t(e.ino);

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 1fddcd45e37576e5d3811056051c3ad323a05999..275b1554508293ffe6c209584e192a5d546449f2 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -181,7 +181,7 @@ private:
   set<int> quorum;       // current active set of monitors (if !starting)
   utime_t leader_since;  // when this monitor became the leader, if it is the leader
   utime_t exited_quorum; // time detected as not in quorum; 0 if in
-  unsigned quorum_features;  ///< intersection of quorum member feature bits
+  uint64_t quorum_features;  ///< intersection of quorum member feature bits
 
   set<string> outside_quorum;
   entity_inst_t slurp_source;
@@ -233,7 +233,7 @@ public:
       q.insert(monmap->get_name(*p));
     return q;
   }
-  unsigned get_quorum_features() const {
+  uint64_t get_quorum_features() const {
     return quorum_features;
   }
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index fc434ed9b85a49a1d31cc1f5b1a9319fc237a4c3..cf7d131c32e1727fe0db04dc872b4f3d5b154ea1 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -158,7 +158,7 @@ struct Connection : public RefCountedObject {
   RefCountedObject *priv;
   int peer_type;
   entity_addr_t peer_addr;
-  unsigned features;
+  uint64_t features;
   RefCountedObject *pipe;
   bool failed;              /// true if we are a lossy connection that has failed.
 
@@ -250,10 +250,10 @@ public:
   const entity_addr_t& get_peer_addr() { return peer_addr; }
   void set_peer_addr(const entity_addr_t& a) { peer_addr = a; }
 
-  int get_features() const { return features; }
-  bool has_feature(int f) const { return features & f; }
-  void set_features(unsigned f) { features = f; }
-  void set_feature(unsigned f) { features |= f; }
+  uint64_t get_features() const { return features; }
+  bool has_feature(uint64_t f) const { return features & f; }
+  void set_features(uint64_t f) { features = f; }
+  void set_feature(uint64_t f) { features |= f; }
 
   void post_rx_buffer(tid_t tid, bufferlist& bl) {
     Mutex::Locker l(lock);

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 1ebf2854473beaadf62ada7c88549e95514eed71..12d47c0adeb826ce77b6f99df98dc66de473050a 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -595,7 +595,7 @@ int Pipe::accept()
   if (policy.lossy)
     reply.flags = reply.flags | CEPH_MSG_CONNECT_LOSSY;
 
-  connection_state->set_features((int)reply.features & (int)connect.features);
+  connection_state->set_features((uint64_t)reply.features & (uint64_t)connect.features);
   ldout(msgr->cct,10) << "accept features " << connection_state->get_features() << dendl;
 
   delete session_security;