From 0d744b9cf9d0083cabbc69e878baa023c3db168f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Sun, 29 May 2011 21:20:59 -0700
Subject: [PATCH] --- yaml --- r: 252926 b: refs/heads/master c:
 3cebde2413ba42504cf2c10ec1d47582912435cd h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/powermac/pic.c | 3 +--
 trunk/fs/namei.c                            | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4436d789b288..bf535bc59084 100644
--- 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
index 7667db448aa7..9089b0421191 100644
--- 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
index 1ab641f2e78e..e2e4e8d032ee 100644
--- 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;