projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e54ec1
)
ufs: remove unnecessary dentry_unhash from rmdir, dir rename
author
Sage Weil
<
[email protected]
>
Fri, 27 May 2011 20:42:01 +0000
(13:42 -0700)
committer
Al Viro
<
[email protected]
>
Sat, 28 May 2011 05:02:51 +0000
(
01:02
-0400)
ufs does not have problems with references to unlinked directories.
CC: Evgeniy Dushistov <
[email protected]
>
Signed-off-by: Sage Weil <
[email protected]
>
Signed-off-by: Al Viro <
[email protected]
>
fs/ufs/namei.c
patch
|
blob
|
history
diff --git
a/fs/ufs/namei.c
b/fs/ufs/namei.c
index 953ebdfc5bf7ea18d8d87e8ccd98697a90e798a7..29309e25417fdf30209f69d301ea55e4daaed401 100644
(file)
--- a/
fs/ufs/namei.c
+++ b/
fs/ufs/namei.c
@@
-258,8
+258,6
@@
static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
struct inode * inode = dentry->d_inode;
int err= -ENOTEMPTY;
- dentry_unhash(dentry);
-
lock_ufs(dir->i_sb);
if (ufs_empty_dir (inode)) {
err = ufs_unlink(dir, dentry);
@@
-284,9
+282,6
@@
static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct ufs_dir_entry *old_de;
int err = -ENOENT;
- if (new_inode && S_ISDIR(new_inode->i_mode))
- dentry_unhash(new_dentry);
-
old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
if (!old_de)
goto out;