Return-Path: Received: from cobra.newdream.net ([66.33.216.30]:48332 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753610Ab1EXTnv (ORCPT ); Tue, 24 May 2011 15:43:51 -0400 From: Sage Weil To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, hch@lst.de, Sage Weil , Trond Myklebust , linux-nfs@vger.kernel.org Subject: [PATCH 16/19] nfs: remove unnecessary dentry_unhash on rmdir/rename_dir Date: Tue, 24 May 2011 13:06:19 -0700 Message-Id: <1306267582-5347-17-git-send-email-sage@newdream.net> In-Reply-To: <1306267582-5347-1-git-send-email-sage@newdream.net> References: <1306267582-5347-1-git-send-email-sage@newdream.net> Sender: linux-nfs-owner@vger.kernel.org List-ID: Content-Type: text/plain MIME-Version: 1.0 NFS has no problems with lingering references to unlinked directory inodes. CC: Trond Myklebust CC: linux-nfs@vger.kernel.org Signed-off-by: Sage Weil --- fs/nfs/dir.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 87daf79..7237672 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1748,8 +1748,6 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry) dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n", dir->i_sb->s_id, dir->i_ino, dentry->d_name.name); - dentry_unhash(dentry); - error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name); /* Ensure the VFS deletes this inode */ if (error == 0 && dentry->d_inode != NULL) @@ -1959,9 +1957,6 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, new_dentry->d_parent->d_name.name, new_dentry->d_name.name, new_dentry->d_count); - if (new_inode && S_ISDIR(new_inode->i_mode)) - dentry_unhash(new_dentry); - /* * For non-directories, check whether the target is busy and if so, * make a copy of the dentry and then do a silly-rename. If the -- 1.7.0