Merge branch 'string' into unstable

Conflicts:
	src/client/Client.h
	src/messages/MAuthReply.h
	src/messages/MClientLease.h
	src/osd/ReplicatedPG.cc
	src/osd/osd_types.h
	src/osdc/Journaler.h

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
index 5f328e24f851aece365d15b15b016c8fd9bede6d,621411634e6c82b1ab68979485a7d347eba74e20..8f123b0dca20cdf7788b37773e7abdbf5f89340c
--- 1/src/client/Client.h
--- 2/src/client/Client.h
+++ b/src/client/Client.h
@@@ -250,8 -250,8 +250,8 @@@ class Dentry : public LRUObject 
  class Dir {
   public:
    Inode    *parent_inode;  // my inode
-   hash_map<nstring, Dentry*> dentries;
+   hash_map<string, Dentry*> dentries;
 -  __u64 release_count;
 +  uint64_t release_count;
  
    Dir(Inode* in) : release_count(0) { parent_inode = in; }
  

diff --cc src/ebofs/Ebofs.cc
Simple merge

diff --cc src/ebofs/Ebofs.h
index 409688d521b31a7eb86641bd7dd66594ba6a715f,e36b026c8dd574ffd747eb43e8a59482d9f6ce0f..7a82fc15556b62e92a9afd6bc6a95236f15a1841
--- 1/src/ebofs/Ebofs.h
--- 2/src/ebofs/Ebofs.h
+++ b/src/ebofs/Ebofs.h
@@@ -335,15 -335,15 +335,15 @@@ private
  
    bool _write_will_block();
    int _touch(coll_t cid, pobject_t oid);
 -  int _write(coll_t cid, pobject_t oid, __u64 off, size_t len, const bufferlist& bl);
 -  void _trim_from_cache(pobject_t oid, __u64 off, size_t len);
 -  int _truncate(coll_t cid, pobject_t oid, __u64 size);
 -  int _zero(coll_t cid, pobject_t oid, __u64 offset, size_t length);
 +  int _write(coll_t cid, pobject_t oid, uint64_t off, size_t len, const bufferlist& bl);
 +  void _trim_from_cache(pobject_t oid, uint64_t off, size_t len);
 +  int _truncate(coll_t cid, pobject_t oid, uint64_t size);
 +  int _zero(coll_t cid, pobject_t oid, uint64_t offset, size_t length);
    int _remove(coll_t cid, pobject_t oid);
    int _clone(coll_t cid, pobject_t from, pobject_t to);
 -  int _clone_range(coll_t cid, pobject_t from, pobject_t to, __u64 off, __u64 len);
 +  int _clone_range(coll_t cid, pobject_t from, pobject_t to, uint64_t off, uint64_t len);
    int _setattr(pobject_t oid, const char *name, const void *value, size_t size);
-   int _setattrs(pobject_t oid, map<nstring,bufferptr>& attrset);
+   int _setattrs(pobject_t oid, map<string,bufferptr>& attrset);
    int _rmattr(pobject_t oid, const char *name);
    bool _collection_exists(coll_t c);
    int _collection_list(coll_t c, vector<pobject_t>& o);

diff --cc src/ebofs/Onode.h
index d715bbc0e61216e12256067aa9b1e546a3674b0c,3d8754b79fe99b16c3c16813e67ab8a4d7b932de..24c961040f3edc5041da882908117bb0390900f1
--- 1/src/ebofs/Onode.h
--- 2/src/ebofs/Onode.h
+++ b/src/ebofs/Onode.h
@@@ -84,10 -82,10 +82,10 @@@ public
  
    // onode
    set<coll_t>            collections;
-   map<nstring, bufferptr> attr;
+   map<string, bufferptr> attr;
  
    map<block_t, ExtentCsum>   extent_map;
 -  interval_set<__u64> bad_byte_extents;
 +  interval_set<uint64_t> bad_byte_extents;
  
    interval_set<block_t> uncommitted;
  

diff --cc src/include/encoding.h
Simple merge

diff --cc src/include/object.h
Simple merge

diff --cc src/librados.cc
Simple merge

diff --cc src/mds/CDentry.h
Simple merge

diff --cc src/mds/CDir.cc
Simple merge

diff --cc src/mds/CDir.h
Simple merge

diff --cc src/mds/CInode.cc
Simple merge

diff --cc src/mds/CInode.h
Simple merge

diff --cc src/mds/Locker.cc
index 3daf477c48a7d676f54d8ee2f3bac7b88b15b6ee,68e569c314f02f7807296cd3c3dfca66d2133b75..e2fcd528c6cfbc6f1253a357fbf80f22b2de5544
--- 1/src/mds/Locker.cc
--- 2/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@@ -1811,9 -1810,9 +1811,9 @@@ void Locker::handle_client_caps(MClient
  }
  
  void Locker::process_cap_update(MDRequest *mdr, client_t client,
 -                              inodeno_t ino, __u64 cap_id, int caps, int wanted,
 +                              inodeno_t ino, uint64_t cap_id, int caps, int wanted,
                                int seq, int issue_seq, int mseq,
-                               const nstring& dname)
+                               const string& dname)
  {
    CInode *in = mdcache->get_inode(ino);
    if (!in)

diff --cc src/mds/Locker.h
index 1cb33eeb3e1351bc55e501924092fef5d0318d07,149473d6114b225fea7fbb0990501298780026f8..6dcb3c2b6896f2b8ceb7b21a24c6ee01637ea0fa
--- 1/src/mds/Locker.h
--- 2/src/mds/Locker.h
+++ b/src/mds/Locker.h
@@@ -169,9 -169,9 +169,9 @@@ public
  
    // caps
    void process_cap_update(MDRequest *mdr, client_t client,
 -                        inodeno_t ino, __u64 cap_id, int caps, int wanted,
 +                        inodeno_t ino, uint64_t cap_id, int caps, int wanted,
                          int seq, int issue_seq, int mseq,
-                         const nstring& dname);
+                         const string& dname);
    void kick_cap_releases(MDRequest *mdr);
  
   protected:

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mds/events/EMetaBlob.h
Simple merge

diff --cc src/mds/mdstypes.h
Simple merge

diff --cc src/messages/MAuthReply.h
index 561c10eeb6bf2834d440570ed587df26eaabeed9,3458262bfc2944cfe6f4ab64a415a36fdd05b3c1..c7eb2184ffb42f697923e0786aeecc7a9cd07eef
--- 1/src/messages/MAuthReply.h
--- 2/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@@ -20,12 -20,12 +20,12 @@@
  struct MAuthReply : public Message {
    __u32 protocol;
    __s32 result;
 -  __u64 global_id;      // if zero, meaningless
 +  uint64_t global_id;      // if zero, meaningless
-   cstring result_msg;
+   string result_msg;
    bufferlist result_bl;
  
    MAuthReply() : Message(CEPH_MSG_AUTH_REPLY), protocol(0), result(0) {}
-   MAuthReply(__u32 p, bufferlist *bl = NULL, int r = 0, uint64_t gid=0, const char *msg = 0) :
 -  MAuthReply(__u32 p, bufferlist *bl = NULL, int r = 0, __u64 gid=0, const char *msg = "") :
++  MAuthReply(__u32 p, bufferlist *bl = NULL, int r = 0, uint64_t gid=0, const char *msg = "") :
      Message(CEPH_MSG_AUTH_REPLY),
      protocol(p), result(r), global_id(gid),
      result_msg(msg) {

diff --cc src/messages/MClientLease.h
index c3746fc8035ab9e1861f9d4aee3e2e7464c1a849,8d5b9b8e3e551120e832d7c96121db723af14be2..b817cf2d548171ed88bd298eae08c625cd42caaa
--- 1/src/messages/MClientLease.h
--- 2/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@@ -39,7 -39,7 +39,7 @@@ struct MClientLease : public Message 
      h.first = sf;
      h.last = sl;
    }
-   MClientLease(int ac, ceph_seq_t seq, int m, uint64_t i, uint64_t sf, uint64_t sl, const nstring& d) :
 -  MClientLease(int ac, ceph_seq_t seq, int m, __u64 i, __u64 sf, __u64 sl, const string& d) :
++  MClientLease(int ac, ceph_seq_t seq, int m, uint64_t i, uint64_t sf, uint64_t sl, const string& d) :
      Message(CEPH_MSG_CLIENT_LEASE),
      dname(d) {
      h.action = ac;

diff --cc src/messages/MOSDSubOp.h
index 07c38739aeca2df6767df6ef5da5cdeb1668316e,63af1533487310495eda7345a26f505808beeaed..b28d8d6600b21bf2a2560a145efc14eb946fc630
--- 1/src/messages/MOSDSubOp.h
--- 2/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@@ -59,10 -59,10 +59,10 @@@ public
    eversion_t pg_trim_to;   // primary->replica: trim to here
    osd_peer_stat_t peer_stat;
  
-   map<nstring,bufferptr> attrset;
+   map<string,bufferptr> attrset;
  
 -  interval_set<__u64> data_subset;
 -  map<sobject_t, interval_set<__u64> > clone_subsets;
 +  interval_set<uint64_t> data_subset;
 +  map<sobject_t, interval_set<uint64_t> > clone_subsets;
  
   virtual void decode_payload() {
      bufferlist::iterator p = payload.begin();

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/mon/Session.h
Simple merge

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/FileStore.h
Simple merge

diff --cc src/os/ObjectStore.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.h
index 102974993e9941707a9385a7aaa1b0a166f53808,9b55a83bc9a2a5b4d39c89a9e9077917672ad647..53936c315bb23f656340ad3f108d9dd4bc9b3030
--- 1/src/osd/OSDMap.h
--- 2/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@@ -675,10 -659,8 +675,10 @@@ private
  
      // index pool names
      name_pool.clear();
-     for (map<int,nstring>::iterator i = pool_name.begin(); i != pool_name.end(); i++)
+     for (map<int,string>::iterator i = pool_name.begin(); i != pool_name.end(); i++)
        name_pool[i->second] = i->first;
 +    
 +    calc_num_osds();
    }
   
  

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
index 0290f7c92fbb65e6ac69329af457b056f48c623e,6a1d9d15a7ae8e58e05ff91b95cad143961d6fe2..3d28e55cbfa1859f470cb925902d42f8f22f7f9f
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -2830,8 -2831,8 +2830,8 @@@ void ReplicatedPG::push(const sobject_t
  {
    // read data+attrs
    bufferlist bl;
-   map<nstring,bufferptr> attrset;
+   map<string,bufferptr> attrset;
 -  __u64 size;
 +  uint64_t size;
  
    if (data_subset.size() || clone_subsets.size()) {
      struct stat st;

diff --cc src/osd/osd_types.h
index bc42845fdf54f29060f7212859f6e94a32961a77,3a085779cadd7c7879bc72cfe9741385b0f1f352..a5508012334ae0e8536735634f177c84a0dabe51
--- 1/src/osd/osd_types.h
--- 2/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@@ -1250,8 -1248,8 +1249,8 @@@ inline ostream& operator<<(ostream& out
  struct ScrubMap {
    struct object {
      sobject_t poid;
 -    __u64 size;
 +    uint64_t size;
-     map<nstring,bufferptr> attrs;
+     map<string,bufferptr> attrs;
  
      void encode(bufferlist& bl) const {
        __u8 struct_v = 1;

diff --cc src/osdc/Journaler.h
index dc907cac0907678d6c5be34909a1cab86186aa5e,5d12d75a31f860f170424b4b4782d2dab6445c8b..91a21cc274e00f3e33097fbfec038b34f0598654
--- 1/src/osdc/Journaler.h
--- 2/src/osdc/Journaler.h
+++ b/src/osdc/Journaler.h
@@@ -64,14 -64,14 +64,14 @@@ class Journaler 
  public:
    // this goes at the head of the log "file".
    struct Header {
 -    __s64 trimmed_pos;
 -    __s64 expire_pos;
 -    __s64 read_pos;
 -    __s64 write_pos;
 +    int64_t trimmed_pos;
 +    int64_t expire_pos;
 +    int64_t read_pos;
 +    int64_t write_pos;
-     nstring magic;
+     string magic;
      ceph_file_layout layout;
  
-     Header(const char *m=0) :
+     Header(const char *m="") :
        trimmed_pos(0), expire_pos(0), read_pos(0), write_pos(0),
        magic(m) { }
  

diff --cc src/osdc/Objecter.h
Simple merge

diff --cc src/rbdtool.cc
Simple merge