diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 20:30:59 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 20:30:59 +0900 |
| commit | 89c122236e60747f920008c9cf4e9cbde3333e50 (patch) | |
| tree | f43cf6740b16385a37045473127dc96ae26a6120 | |
| parent | 339dedf709e21d5718d6596750166f70e8bed40a (diff) | |
| parent | c7427d23f7ed695ac226dbe3a84d7f19091d34ce (diff) | |
| download | linux-3.10-89c122236e60747f920008c9cf4e9cbde3333e50.tar.gz linux-3.10-89c122236e60747f920008c9cf4e9cbde3333e50.tar.bz2 linux-3.10-89c122236e60747f920008c9cf4e9cbde3333e50.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
autofs4: bogus dentry_unhash() added in ->unlink()
vfs: shrink_dcache_parent before rmdir, dir rename
| -rw-r--r-- | fs/autofs4/root.c | 2 | ||||
| -rw-r--r-- | fs/namei.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 87d95a8cddb..f55ae23b137 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -583,8 +583,6 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) return -EACCES; - dentry_unhash(dentry); - if (atomic_dec_and_test(&ino->count)) { p_ino = autofs4_dentry_ino(dentry->d_parent); if (p_ino && dentry->d_parent != dentry) diff --git a/fs/namei.c b/fs/namei.c index 1ab641f2e78..e2e4e8d032e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -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; |