Merge remote-tracking branch 'gh/wip-fs-quota'

Conflicts:
	src/client/Client.cc

diff --cc src/ceph_mds.cc
Simple merge

diff --cc src/client/Client.cc
index 0a0dc85b65146c627dbc0e126413a2766ab018e8,4048b30072027adca8004dce29c2a5273c5a2f02..11222b4d90c46182b0a6d9d72c61a793cda7ab09
--- 1/src/client/Client.cc
--- 2/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -47,7 -47,8 +47,8 @@@ using namespace std
  #include "messages/MClientLease.h"
  #include "messages/MClientSnap.h"
  #include "messages/MCommandReply.h"
 +#include "messages/MOSDMap.h"
+ #include "messages/MClientQuota.h"
  
  #include "messages/MGenericMessage.h"
  
@@@ -2409,15 -2359,15 +2436,22 @@@ void Client::put_inode(Inode *in, int n
      inode_map.erase(in->vino());
      in->cap_item.remove_myself();
      in->snaprealm_item.remove_myself();
-     if (in == root)
+     if (in == root) {
        root = 0;
+       root_ancestor = 0;
+       while (!root_parents.empty()) {
+         Inode *in = root_parents.begin()->second;
+         root_parents.erase(root_parents.begin());
+         put_inode(in);
+       }
+     }
 +
 +    if (!in->oset.objects.empty()) {
 +      ldout(cct, 0) << __func__ << ": leftover objects on inode 0x"
 +        << std::hex << in->ino << std::dec << dendl;
 +      assert(in->oset.objects.empty());
 +    }
 +
      delete in->fcntl_locks;
      delete in->flock_locks;
      delete in;

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

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

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

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

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

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

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

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