From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sage Weil Subject: [PATCH 06/18] libfs: drop unneeded dentry_unhash Date: Mon, 9 May 2011 21:43:24 -0700 Message-ID: <1305002616-16782-7-git-send-email-sage@newdream.net> References: <1305002616-16782-1-git-send-email-sage@newdream.net> Cc: Sage Weil To: viro@ZenIV.linux.org.uk, hch@lst.de, linux-fsdevel@vger.kernel.org Return-path: Received: from cobra.newdream.net ([66.33.216.30]:57283 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914Ab1EJFKo (ORCPT ); Tue, 10 May 2011 01:10:44 -0400 In-Reply-To: <1305002616-16782-1-git-send-email-sage@newdream.net> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: There are no libfs issues with dangling references to empty directories. Signed-off-by: Sage Weil --- fs/libfs.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 91a3710..c88eab5 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -311,8 +311,6 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry) if (!simple_empty(dentry)) return -ENOTEMPTY; - dentry_unhash(dentry); - drop_nlink(dentry->d_inode); simple_unlink(dir, dentry); drop_nlink(dir); @@ -325,9 +323,6 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *inode = old_dentry->d_inode; int they_are_dirs = S_ISDIR(old_dentry->d_inode->i_mode); - if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) - dentry_unhash(new_dentry); - if (!simple_empty(new_dentry)) return -ENOTEMPTY; -- 1.7.1