]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Revert "mds: rip out rename linkmerge support"
authorSage Weil <sage@newdream.net>
Wed, 6 Apr 2011 23:34:36 +0000 (16:34 -0700)
committerSage Weil <sage@newdream.net>
Wed, 6 Apr 2011 23:34:36 +0000 (16:34 -0700)
commite5fce7b8c6da001a4485edcfdad33082cf6ea0c4
treee2a92a3062719027088450de87a34b2b748aa6b1
parent7470cc4eb5c399f92e5f00c3e7abe536d47dce47
Revert "mds: rip out rename linkmerge support"

This reverts commit d467fbfd1714ef04faf41e604d6a78e33ef7fa10.

The linkmerge stuff _is_ needed for reintegrating multi-linked stray
inodes back into the hierarchy.  E.g.,

 touch a
 ln a b
 rm a

The MDS will want to renamed the stray inode to the b dentry.

Conflicts:

src/mds/Server.cc

Signed-off-by: Sage Weil <sage@newdream.net>
src/mds/Server.cc