From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Jun 2009 04:00:58 +0000 (-0700)
Subject: Merge branch 'mdsmap' into unstable
X-Git-Tag: v0.10~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93ada6c6c15007baa060720d0e40254f5d93ff3a;p=ceph.git

Merge branch 'mdsmap' into unstable

Conflicts:

	src/mds/CDir.cc
---

93ada6c6c15007baa060720d0e40254f5d93ff3a
diff --cc src/mds/CDir.cc
index e9e8b9f81ddc,bcc47c483ea4..29b0e26ef679
--- a/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,