Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6179

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

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

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

diff --cc src/client/MetaRequest.h
index 7ace1dc65cfeed38ec6c32fbb29fe7ed09d71f63,bcd96698ec27e1e6c60d7ab84bda5ab3e9356cb8..7a6bd3fb0f81e1d9523e1431b5349b12ac068fa9
--- 1/src/client/MetaRequest.h
--- 2/src/client/MetaRequest.h
+++ b/src/client/MetaRequest.h
@@@ -93,10 -92,9 +93,10 @@@ public
      mds(-1), resend_mds(-1), send_to_auth(false), sent_on_mseq(0),
      num_fwd(0), retry_attempt(0),
      ref(1), reply(0), 
-     kick(false), aborted(false), success(false),
+     kick(false), success(false),
      readdir_offset(0), readdir_end(false), readdir_num(0),
 -    got_unsafe(false), item(this), unsafe_item(this), unsafe_dir_item(this),
 +    got_unsafe(false), item(this), unsafe_item(this),
 +    unsafe_dir_item(this), unsafe_target_item(this),
      lock("MetaRequest lock"),
      caller_cond(0), dispatch_cond(0) {
      memset(&head, 0, sizeof(ceph_mds_request_head));

diff --cc src/common/config_opts.h
Simple merge

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