Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757464Ab1EaQZS (ORCPT ); Tue, 31 May 2011 12:25:18 -0400 Received: from cobra.newdream.net ([66.33.216.30]:32835 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757396Ab1EaQZP (ORCPT ); Tue, 31 May 2011 12:25:15 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=newdream.net; h=date:from:to:cc :subject:in-reply-to:message-id:references:mime-version: content-type; q=dns; s=newdream.net; b=dgtm6ouHACDD94tE0pzs441Il McsC3mhfu3rpCuhGoru7yW6H5dYHv6r0Ttof2TWq2Vw7XW8qs0MrAqN/uNaQgMou N5h7RPCavmnXeYAqWWYWY4lKwEhrKrDKkTZOSwk/D/OwSHG43W+kfR5DpYxvdGYm Hr32iMHxHkqldKjbgM= Date: Tue, 31 May 2011 09:26:52 -0700 (PDT) From: Sage Weil To: Christoph Hellwig cc: Al Viro , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, xfs@oss.sgi.com Subject: Re: [git pull] dentry_unhash() breakage In-Reply-To: <20110530085922.GA11336@infradead.org> Message-ID: References: <20110530020604.GC561@dastard> <20110530034741.GD561@dastard> <20110530055601.GK11521@ZenIV.linux.org.uk> <20110530085922.GA11336@infradead.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1869 Lines: 65 On Mon, 30 May 2011, Christoph Hellwig wrote: > On Mon, May 30, 2011 at 06:56:01AM +0100, Al Viro wrote: > > A couple of dentry_unhash fallout fixes > > Shouldn't we do the shrink_dcache_parent only after a successfull > rmdir or rename? Yeah, that makes more sense to me... sage >From 4e9be5f3fc5f9995b0b1966cda95bb5386e20444 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 31 May 2011 09:26:13 -0700 Subject: [PATCH] vfs: shrink_dcache_parent on rmdir, dir rename only on success Only prune the dentries of the rmdir or dir rename succeeds. Doing so on failure makes no sense (though it's mostly harmless). Signed-off-by: Sage Weil --- fs/namei.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index e2e4e8d..72b0370 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2579,11 +2579,11 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) if (error) goto out; - shrink_dcache_parent(dentry); error = dir->i_op->rmdir(dir, dentry); if (error) goto out; + shrink_dcache_parent(dentry); dentry->d_inode->i_flags |= S_DEAD; dont_mount(dentry); @@ -2994,13 +2994,12 @@ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, if (d_mountpoint(old_dentry) || d_mountpoint(new_dentry)) goto out; - if (target) - shrink_dcache_parent(new_dentry); error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); if (error) goto out; if (target) { + shrink_dcache_parent(new_dentry); target->i_flags |= S_DEAD; dont_mount(new_dentry); } -- 1.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/