Merge branch 'master' into rados

Conflicts:

	.gitignore
	src/TODO

diff --cc src/TODO
index d5c1d7034a284ad9f0485dea8cc0fbaff5987043,88770a3005954880505de6101baa8dbd1867d512..f2da37d3770cb5ec8e7e0136c305955fb5d7225d
--- 1/src/TODO
--- 2/src/TODO
+++ b/src/TODO
@@@ -21,10 -22,17 +21,15 @@@ code cleanu
  kernel client
  - msg layer (patience)
  - mds client
 -  - handle map changes (check for mds failure)
 -- mount
 -  - get handle on root mount point
 +  - examine new mds maps to kick requests for failed nodes...
  - osd client
+   - async (caching) mode
+   - sync mode (write-through)
+   - capability changes (flush)
+   - osd ack vs commit handling.  hmm!
+   - handle map changes (resubmit ops)
  - mon client
 -  - work out message resend logic..
 +  - work out message resend logic..?
  
  
  osdmon

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

diff --cc src/messages/MClientRequest.h
Simple merge

diff --cc src/messages/MOSDOp.h
index debd637906006c60a3bd441d12704c59b12ddb09,b2b2a8317a96169a79cb62a93592b105a509dc98..0e923dda79f2c57ec1d6bd3f2855718361e55a66
--- 1/src/messages/MOSDOp.h
--- 2/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@@ -135,17 -189,18 +135,17 @@@ public
    }
  
    virtual void encode_payload() {
 -    ::_encode(st, payload);
 -    ::_encode(attrset, payload);
 -    env.data_off = st.offset;
 +    ::_encode(head, payload);
 +    env.data_off = head.offset;
    }
  
-   virtual char *get_type_name() { return "osd_op"; }
+   const char *get_type_name() { return "osd_op"; }
    void print(ostream& out) {
 -    out << "osd_op(" << st.reqid
 -      << " " << get_opname(st.op)
 -      << " " << st.oid;
 -    if (st.length) out << " " << st.offset << "~" << st.length;
 -    if (st.retry_attempt) out << " RETRY";
 +    out << "osd_op(" << get_reqid()
 +      << " " << get_opname(head.op)
 +      << " " << head.oid;
 +    if (head.length) out << " " << head.offset << "~" << head.length;
 +    if (is_retry_attempt()) out << " RETRY";
      out << ")";
    }
  };

diff --cc src/messages/MOSDOpReply.h
index 0891ce41944f9680a5345637668ad3ceed6e710f,bcaee436d716c08a2cbdf828863e6afcffb38946..ef770e43a5b1d8782ff41e782f1ec3324d37b36a
--- 1/src/messages/MOSDOpReply.h
--- 2/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@@ -76,22 -118,24 +76,22 @@@ public
    // marshalling
    virtual void decode_payload() {
      int off = 0;
 -    ::_decode(st, payload, off);
 -    ::_decode(attrset, payload, off);
 +    ::_decode(head, payload, off);
    }
    virtual void encode_payload() {
 -    ::_encode(st, payload);
 -    ::_encode(attrset, payload);
 -    env.data_off = st.offset;
 +    ::_encode(head, payload);
 +    env.data_off = head.offset;
    }
  
-   virtual char *get_type_name() { return "osd_op_reply"; }
+   const char *get_type_name() { return "osd_op_reply"; }
    
    void print(ostream& out) {
 -    out << "osd_op_reply(" << st.reqid
 -      << " " << MOSDOp::get_opname(st.op)
 -      << " " << st.oid;
 -    if (st.length) out << " " << st.offset << "~" << st.length;
 -    if (st.op >= 10) {
 -      if (st.commit)
 +    out << "osd_op_reply(" << get_tid()
 +      << " " << MOSDOp::get_opname(head.op)
 +      << " " << head.oid;
 +    if (head.length) out << " " << head.offset << "~" << head.length;
 +    if (head.op >= 10) {
 +      if (is_safe())
        out << " commit";
        else
        out << " ack";

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

diff --cc src/msg/Message.h
Simple merge

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

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