Merge branch 'mdsmap' into unstable

Conflicts:

	src/mds/CDir.cc

diff --cc src/config.cc
Simple merge

diff --cc src/config.h
Simple merge

diff --cc src/mds/CDir.cc
index e9e8b9f81ddc06b5ed238e8cb1805d7f5c44f38f,bcc47c483ea4e6b7d525a6bb6356995ee61431b1..29b0e26ef67957b986096d15e9a43e76056935f6
--- 1/src/mds/CDir.cc
--- 2/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@@ -1486,15 -1572,7 +1572,16 @@@ void CDir::_commit(version_t want
    inode->make_path_string(path);
    m.setxattr("path", path);
  
 +  CDentry *pdn = inode->get_parent_dn();
 +  if (pdn) {
 +    bufferlist parent(16 + pdn->name.length());
 +    __u64 ino = pdn->get_dir()->get_inode()->ino();
 +    ::encode(ino, parent);
 +    ::encode(pdn->name, parent);
 +    m.setxattr("parent", parent);
 +  }
 +
+   SnapContext snapc;
    object_t oid = get_ondisk_object();
    OSDMap *osdmap = cache->mds->objecter->osdmap;
    ceph_object_layout ol = osdmap->make_object_layout(oid,

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

diff --cc src/osdc/Objecter.h
Simple merge