From cf3f9a01a60f9b3ee04adae1eb9176d44b17fa32 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:12 -0700 Subject: [PATCH] --- yaml --- r: 252723 b: refs/heads/master c: 94f9901b6c05d5e1e38d887179b8307efbc8e10c h: refs/heads/master i: 252721: e159be073c8cbfe50f0b6db9d58e0993edfbb47d 252719: 1f1ec06e9ef8448cf9f0e92fe274313ad8f3ff7c v: v3 --- [refs] | 2 +- trunk/fs/affs/namei.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2403e6b7ba46..74797088fa5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86905d6d96f138a99326016e4f0ca933200e0729 +refs/heads/master: 94f9901b6c05d5e1e38d887179b8307efbc8e10c diff --git a/trunk/fs/affs/namei.c b/trunk/fs/affs/namei.c index 03330e2e390c..e3e9efc1fdd8 100644 --- a/trunk/fs/affs/namei.c +++ b/trunk/fs/affs/namei.c @@ -320,8 +320,6 @@ affs_rmdir(struct inode *dir, struct dentry *dentry) dentry->d_inode->i_ino, (int)dentry->d_name.len, dentry->d_name.name); - dentry_unhash(dentry); - return affs_remove_header(dentry); } @@ -419,9 +417,6 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry, struct buffer_head *bh = NULL; int retval; - if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) - dentry_unhash(new_dentry); - pr_debug("AFFS: rename(old=%u,\"%*s\" to new=%u,\"%*s\")\n", (u32)old_dir->i_ino, (int)old_dentry->d_name.len, old_dentry->d_name.name, (u32)new_dir->i_ino, (int)new_dentry->d_name.len, new_dentry->d_name.name);