From 69b248474adec4bbd296bd467bf657a05a9d9b0c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:04 -0700 Subject: [PATCH] --- yaml --- r: 252715 b: refs/heads/master c: 8aaa0f5431d8d1181b3d1a1bcd8f3330c0ce275f h: refs/heads/master i: 252713: 64ec4e4369dc2381e36dc3457be1c852ccb30072 252711: 85a3bfa081111a1d27e2429d145f197dbce2a011 v: v3 --- [refs] | 2 +- trunk/fs/omfs/dir.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c80f572c1e66..333d10ac0c45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7020739df2fa0e2126fc9739987e016860f14323 +refs/heads/master: 8aaa0f5431d8d1181b3d1a1bcd8f3330c0ce275f diff --git a/trunk/fs/omfs/dir.c b/trunk/fs/omfs/dir.c index c368360c35a1..3b8d3979e03b 100644 --- a/trunk/fs/omfs/dir.c +++ b/trunk/fs/omfs/dir.c @@ -241,11 +241,9 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry) int ret; - if (S_ISDIR(inode->i_mode)) { - dentry_unhash(dentry); - if (!omfs_dir_is_empty(inode)) - return -ENOTEMPTY; - } + if (S_ISDIR(inode->i_mode) && + !omfs_dir_is_empty(inode)) + return -ENOTEMPTY; ret = omfs_delete_entry(dentry); if (ret) @@ -382,9 +380,6 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, int err; if (new_inode) { - if (S_ISDIR(new_inode->i_mode)) - dentry_unhash(new_dentry); - /* overwriting existing file/dir */ err = omfs_remove(new_dir, new_dentry); if (err)