Merge branch 'unstable' into encoding

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

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

diff --cc src/messages/MMDSGetMap.h
index 99b3af83bd79d0f571e0e5845d610e2b4eb37959,ae47b4ce6bf32545317822bd580dbd051c5dd6f8..e5fea016677ce788152263cf82349a6141ec2d6d
--- 1/src/messages/MMDSGetMap.h
--- 2/src/messages/MMDSGetMap.h
+++ b/src/messages/MMDSGetMap.h
@@@ -22,24 -23,27 +22,27 @@@
  class MMDSGetMap : public Message {
   public:
    ceph_fsid fsid;
-   epoch_t have;
+   epoch_t want;
  
    MMDSGetMap() {}
-   MMDSGetMap(ceph_fsid &f, epoch_t h=0) : 
+   MMDSGetMap(ceph_fsid &f, epoch_t w=0) : 
      Message(CEPH_MSG_MDS_GETMAP), 
      fsid(f),
-     have(h) { }
+     want(w) { }
  
    const char *get_type_name() { return "mds_getmap"; }
+   void print(ostream& out) {
+     out << "mds_getmap(want " << want << ")";
+   }
    
    void encode_payload() {
 -    ::_encode_simple(fsid, payload);
 -    ::_encode_simple(want, payload);
 +    ::encode(fsid, payload);
-     ::encode(have, payload);
++    ::encode(want, payload);
    }
    void decode_payload() {
      bufferlist::iterator p = payload.begin();
 -    ::_decode_simple(fsid, p);
 -    ::_decode_simple(want, p);
 +    ::decode(fsid, p);
-     ::decode(have, p);
++    ::decode(want, p);
    }
  };