Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cebde24 authored by Sage Weil's avatar Sage Weil Committed by Al Viro
Browse files

vfs: shrink_dcache_parent before rmdir, dir rename 



The dentry_unhash push-down series missed that shink_dcache_parent needs to
be called prior to rmdir or dir rename to clear DCACHE_REFERENCED and
allow efficient dentry reclaim.

Reported-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 55922c9d

fs/namei.c

+3 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,7 @@ 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;
@@ -2993,6 +2994,8 @@ 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;