From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sage Weil Subject: [PATCH 13/26] hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename Date: Fri, 27 May 2011 13:42:06 -0700 Message-ID: <1306528939-30636-14-git-send-email-sage@newdream.net> References: <1306528939-30636-1-git-send-email-sage@newdream.net> Cc: linux-fsdevel@vger.kernel.org, Sage Weil To: hch@infradead.org, viro@ZenIV.linux.org.uk Return-path: Received: from cobra.newdream.net ([66.33.216.30]:43503 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756712Ab1E0Ulw (ORCPT ); Fri, 27 May 2011 16:41:52 -0400 In-Reply-To: <1306528939-30636-1-git-send-email-sage@newdream.net> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: hfsplus does not have problems with references to unlinked directories. Signed-off-by: Sage Weil --- fs/hfsplus/dir.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index b288350..4df5059 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -370,8 +370,6 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry) struct inode *inode = dentry->d_inode; int res; - dentry_unhash(dentry); - if (inode->i_size != 2) return -ENOTEMPTY; @@ -469,12 +467,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry, /* Unlink destination if it already exists */ if (new_dentry->d_inode) { - if (S_ISDIR(new_dentry->d_inode->i_mode)) { - dentry_unhash(new_dentry); + if (S_ISDIR(new_dentry->d_inode->i_mode)) res = hfsplus_rmdir(new_dir, new_dentry); - } else { + else res = hfsplus_unlink(new_dir, new_dentry); - } if (res) return res; } -- 1.7.0