omfs: remove unnecessary dentry_unhash on rmdir, dir rneame
omfs does not have problems with references to unlinked directories. CC: Bob Copeland <me@bobcopeland.com> CC: linux-karma-devel@lists.sourceforge.net Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
7020739df2
Коммит
8aaa0f5431
|
@ -241,11 +241,9 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
||||||
if (S_ISDIR(inode->i_mode)) {
|
if (S_ISDIR(inode->i_mode) &&
|
||||||
dentry_unhash(dentry);
|
!omfs_dir_is_empty(inode))
|
||||||
if (!omfs_dir_is_empty(inode))
|
return -ENOTEMPTY;
|
||||||
return -ENOTEMPTY;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = omfs_delete_entry(dentry);
|
ret = omfs_delete_entry(dentry);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -382,9 +380,6 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (new_inode) {
|
if (new_inode) {
|
||||||
if (S_ISDIR(new_inode->i_mode))
|
|
||||||
dentry_unhash(new_dentry);
|
|
||||||
|
|
||||||
/* overwriting existing file/dir */
|
/* overwriting existing file/dir */
|
||||||
err = omfs_remove(new_dir, new_dentry);
|
err = omfs_remove(new_dir, new_dentry);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче