From a3b4b36948c287d298e163a58378025def730b50 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:03 -0700 Subject: [PATCH] --- yaml --- r: 252714 b: refs/heads/master c: 7020739df2fa0e2126fc9739987e016860f14323 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/udf/namei.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 15f25a219f91..c80f572c1e66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc350c2764a657ee012efd5bd260a6cd5be2f877 +refs/heads/master: 7020739df2fa0e2126fc9739987e016860f14323 diff --git a/trunk/fs/udf/namei.c b/trunk/fs/udf/namei.c index 4d76594c2a8f..f1dce848ef96 100644 --- a/trunk/fs/udf/namei.c +++ b/trunk/fs/udf/namei.c @@ -783,8 +783,6 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) struct fileIdentDesc *fi, cfi; struct kernel_lb_addr tloc; - dentry_unhash(dentry); - retval = -ENOENT; fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi); if (!fi) @@ -1083,9 +1081,6 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, struct kernel_lb_addr tloc; struct udf_inode_info *old_iinfo = UDF_I(old_inode); - if (new_inode && S_ISDIR(new_inode->i_mode)) - dentry_unhash(new_dentry); - ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi); if (ofi) { if (ofibh.sbh != ofibh.ebh)