lkml.org 
[lkml]   [2011]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [git pull] dentry_unhash() breakage
    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 <sage@newdream.net>
    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 <sage@newdream.net>
    ---
    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


    \
     
     \ /
      Last update: 2011-05-31 18:27    [W:0.022 / U:61.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site