Merge with Linux 2.4.0-test2.

1 files changed, 22 insertions, 27 deletions

diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index 1daf64cc1..3f3b5fc16 100644
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -104,37 +104,32 @@ int unregister_exec_domain(struct exec_domain *it)
 
 void __set_personality(unsigned long personality)
 {
-	struct exec_domain *it, *prev;
+	struct exec_domain *it;
 
 	it = lookup_exec_domain(personality);
-	if (it == current->exec_domain) {
-		current->personality = personality;
-		return;
-	}
-	if (!it)
-		return;
-	if (atomic_read(&current->fs->count) != 1) {
-		struct fs_struct *new = copy_fs_struct(current->fs);
-		struct fs_struct *old;
-		if (!new) {
-			put_exec_domain(it);
-			return;
+	if (it) {
+		if (atomic_read(&current->fs->count) != 1) {
+			struct fs_struct *new = copy_fs_struct(current->fs);
+			struct fs_struct *old;
+			if (!new) {
+				put_exec_domain(it);
+				return;
+			}
+			task_lock(current);
+			old = current->fs;
+			current->fs = new;
+			task_unlock(current);
+			put_fs_struct(old);
 		}
-		task_lock(current);
-		old = current->fs;
-		current->fs = new;
-		task_unlock(current);
-		put_fs_struct(old);
+		/*
+		 * At that point we are guaranteed to be the sole owner of
+		 * current->fs.
+		 */
+		current->personality = personality;
+		current->exec_domain = it;
+		set_fs_altroot();
+		put_exec_domain(current->exec_domain);
 	}
-	/*
-	 * At that point we are guaranteed to be the sole owner of
-	 * current->fs.
-	 */
-	current->personality = personality;
-	prev = current->exec_domain;
-	current->exec_domain = it;
-	set_fs_altroot();
-	put_exec_domain(prev);
 }
 
 asmlinkage long sys_personality(unsigned long personality)