---

yaml --- r: 252926 b: refs/heads/master c: 3cebde2 h: refs/heads/master v: v3
git-mirror · May 30, 2011 · 0d744b9 · 0d744b9
1 parent cf121c3
commit 0d744b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 339dedf709e21d5718d6596750166f70e8bed40a
+refs/heads/master: 3cebde2413ba42504cf2c10ec1d47582912435cd
diff --git a/trunk/arch/powerpc/platforms/powermac/pic.c b/trunk/arch/powerpc/platforms/powermac/pic.c
@@ -715,8 +715,7 @@ static struct syscore_ops pmacpic_syscore_ops = {
 
 static int __init init_pmacpic_syscore(void)
 {
-	if (pmac_irq_hw[0])
-		register_syscore_ops(&pmacpic_syscore_ops);
+	register_syscore_ops(&pmacpic_syscore_ops);
 	return 0;
 }
 

diff --git a/trunk/fs/namei.c b/trunk/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;