Merge branch 'testing' into unstable

Conflicts:
	src/mds/MDCache.cc

diff --cc src/mds/MDCache.cc
index 2d5947fe0236f14ebfa16d19ceb9f4f97685ef84,92da3351039152255c93c57e1e899060ae618d9f..4587f8528b0be53934c8140ce509d70cfacd12ba
--- 1/src/mds/MDCache.cc
--- 2/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -1379,11 -1358,9 +1380,12 @@@ void MDCache::journal_cow_dentry(Mutati
        if (pcow_inode)
        *pcow_inode = oldin;
        CDentry *olddn = dn->dir->add_primary_dentry(dn->name, oldin, oldfirst, follows);
+       oldin->inode.version = olddn->pre_dirty();
        dout(10) << " olddn " << *olddn << dendl;
 -      metablob->add_primary_dentry(olddn, true);
 +      bufferlist snapbl;
 +      if (dnl->get_inode()->projected_nodes.back()->snapnode)
 +        dnl->get_inode()->projected_nodes.back()->snapnode->encode(snapbl);
 +      metablob->add_primary_dentry(olddn, true, 0, 0, (snapbl.length() ? &snapbl : NULL));
        mut->add_cow_dentry(olddn);
      } else {
        assert(dnl->is_remote());

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