From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 13 Jan 2016 01:57:04 +0000 (-0800)
Subject: Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing
X-Git-Tag: v10.0.3~48^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d3f80acc3221b77a88894f0c3801772aff3f7a7;p=ceph.git

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>
---

1d3f80acc3221b77a88894f0c3801772aff3f7a7
diff --cc src/client/MetaRequest.h
index 7ace1dc65cf,bcd96698ec2..7a6bd3fb0f8
--- a/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));