From 4fadc423b69a3d7cdba7eab6d620981c6f0208d4 Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Sun, 30 Oct 2005 15:02:31 -0800
Subject: [PATCH] --- yaml --- r: 11840 b: refs/heads/master c:
 18a19cb3047e454ee5ecbc35d7acf3f8e09e0466 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cpuset.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45af3c086ff8..386ef60ab83d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 053199edf54f685e7dea765b60d4d5e9070dadec
+refs/heads/master: 18a19cb3047e454ee5ecbc35d7acf3f8e09e0466
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 7491352276b2..6633f3fb6417 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -1113,6 +1113,21 @@ static int cpuset_file_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
+/*
+ * cpuset_rename - Only allow simple rename of directories in place.
+ */
+static int cpuset_rename(struct inode *old_dir, struct dentry *old_dentry,
+                  struct inode *new_dir, struct dentry *new_dentry)
+{
+	if (!S_ISDIR(old_dentry->d_inode->i_mode))
+		return -ENOTDIR;
+	if (new_dentry->d_inode)
+		return -EEXIST;
+	if (old_dir != new_dir)
+		return -EIO;
+	return simple_rename(old_dir, old_dentry, new_dir, new_dentry);
+}
+
 static struct file_operations cpuset_file_operations = {
 	.read = cpuset_file_read,
 	.write = cpuset_file_write,
@@ -1125,6 +1140,7 @@ static struct inode_operations cpuset_dir_inode_operations = {
 	.lookup = simple_lookup,
 	.mkdir = cpuset_mkdir,
 	.rmdir = cpuset_rmdir,
+	.rename = cpuset_rename,
 };
 
 static int cpuset_create_file(struct dentry *dentry, int mode)