Unionfs: revert LTP related fix using d_add/d_instantiate

Revert commit fbeb9bb0290dd12a6f51ccb6a1903995b6d333d4, "Unionfs: properly
hash newly created inodes -- This fixes LTP's syscalls/rename13 test.".  It
breaks 2.6.18 (and possibly older), but is needed for 2.6.19 and newer.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 0173e27d56a1f12abc0c9afc6a2e6988ce285473..d9ca249c790bbf849df1789f0de3f088ac0c26c4 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -330,7 +330,7 @@ check_link:
 
        /* Its a hard link, so use the same inode */
        new_dentry->d_inode = igrab(old_dentry->d_inode);
-       d_add(new_dentry, new_dentry->d_inode);
+       d_instantiate(new_dentry, new_dentry->d_inode);
        unionfs_copy_attr_all(dir, lower_new_dentry->d_parent->d_inode);
        fsstack_copy_inode_size(dir, lower_new_dentry->d_parent->d_inode);
 

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 995875c43254172625f12446704c0790c6bd37c9..12fd13e4d73b2f6af723d58acf08726c10f9d9c2 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -129,9 +129,6 @@ skip:
        /* only (our) lookup wants to do a d_add */
        switch (flag) {
        case INTERPOSE_DEFAULT:
-               /* for operations which create new inodes */
-               d_add(dentry, inode);
-               break;
        case INTERPOSE_REVAL_NEG:
                d_instantiate(dentry, inode);
                break;