]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nilfs2: remove unnecessary dentry_unhash from rmdir, dir rename
authorSage Weil <sage@newdream.net>
Fri, 27 May 2011 20:41:59 +0000 (13:41 -0700)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 28 May 2011 05:02:51 +0000 (01:02 -0400)
nilfs2 does not have problems with references to unlinked directories.

CC: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
CC: linux-nilfs@vger.kernel.org
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/nilfs2/namei.c

index 1102a5fbb7449c6769d6af85c048636f6cb8615b..546849b3e88f1935585067628e158f4233631d17 100644 (file)
@@ -334,8 +334,6 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
        struct nilfs_transaction_info ti;
        int err;
 
-       dentry_unhash(dentry);
-
        err = nilfs_transaction_begin(dir->i_sb, &ti, 0);
        if (err)
                return err;
@@ -371,9 +369,6 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        struct nilfs_transaction_info ti;
        int err;
 
-       if (new_inode && S_ISDIR(new_inode->i_mode))
-               dentry_unhash(new_dentry);
-
        err = nilfs_transaction_begin(old_dir->i_sb, &ti, 1);
        if (unlikely(err))
                return err;