diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:34:09 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:34:24 +0400 |
| commit | 36b2e922b5acd291051fab25bc7535274ce49532 (patch) | |
| tree | ef4cdd6894075bb419cc31625b037f2b9212962f /fs/minix/namei.c | |
| parent | e197f094b7da7d94812492cfcd706d143f1020e5 (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| download | linux-36b2e922b5acd291051fab25bc7535274ce49532.tar.xz | |
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/minix/namei.c')
| -rw-r--r-- | fs/minix/namei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index f60aed8db9c4..6e6777f1b4b2 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -168,8 +168,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry) struct inode * inode = dentry->d_inode; int err = -ENOTEMPTY; - dentry_unhash(dentry); - if (minix_empty_dir(inode)) { err = minix_unlink(dir, dentry); if (!err) { @@ -192,9 +190,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, struct minix_dir_entry * old_de; int err = -ENOENT; - if (new_inode && S_ISDIR(new_inode->i_mode)) - dentry_unhash(new_dentry); - old_de = minix_find_entry(old_dentry, &old_page); if (!old_de) goto out; |