From patchwork Tue May 24 20:06:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 813472 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4OJiVII012582 for ; Tue, 24 May 2011 19:44:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755507Ab1EXToM (ORCPT ); Tue, 24 May 2011 15:44:12 -0400 Received: from cobra.newdream.net ([66.33.216.30]:48304 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184Ab1EXTnu (ORCPT ); Tue, 24 May 2011 15:43:50 -0400 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTPA id 131EEBC982; Tue, 24 May 2011 12:45:11 -0700 (PDT) From: Sage Weil To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, hch@lst.de, Sage Weil , Chris Mason , linux-btrfs@vger.kernel.org Subject: [PATCH 12/19] btrfs: remove unnecessary dentry_unhash in rmdir/rename_dir Date: Tue, 24 May 2011 13:06:15 -0700 Message-Id: <1306267582-5347-13-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1306267582-5347-1-git-send-email-sage@newdream.net> References: <1306267582-5347-1-git-send-email-sage@newdream.net> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 24 May 2011 19:44:31 +0000 (UTC) Btrfs has no problems with lingering references to unlinked directory inodes. CC: Chris Mason CC: linux-btrfs@vger.kernel.org Signed-off-by: Sage Weil --- fs/btrfs/inode.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3a33ae3..7cd8ab0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3062,8 +3062,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) inode->i_ino == BTRFS_FIRST_FREE_OBJECTID) return -ENOTEMPTY; - dentry_unhash(dentry); - trans = __unlink_start_trans(dir, dentry); if (IS_ERR(trans)) return PTR_ERR(trans); @@ -6994,9 +6992,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, u64 root_objectid; int ret; - if (new_inode && S_ISDIR(new_dentry->d_inode->i_mode)) - dentry_unhash(new_dentry); - if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) return -EPERM;