From dcdd0f6f31dcdfdce40d89222f2f9af7738536e8 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:28 +0200
Subject: [PATCH] --- yaml --- r: 100370 b: refs/heads/master c:
 b7fdf9fdd6457c9ed02099fe82bab92b0b3e291b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/ocfs2/stack_user.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 834b78210c9e..a61b758b6990 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 930ab4e532623795f934467c452a8c71be2c30fe
+refs/heads/master: b7fdf9fdd6457c9ed02099fe82bab92b0b3e291b
diff --git a/trunk/fs/ocfs2/stack_user.c b/trunk/fs/ocfs2/stack_user.c
index b503772cd0ec..cd120011104d 100644
--- a/trunk/fs/ocfs2/stack_user.c
+++ b/trunk/fs/ocfs2/stack_user.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <linux/reboot.h>
 #include <asm/uaccess.h>
 
@@ -619,10 +620,12 @@ static int ocfs2_control_open(struct inode *inode, struct file *file)
 		return -ENOMEM;
 	p->op_this_node = -1;
 
+	lock_kernel();
 	mutex_lock(&ocfs2_control_lock);
 	file->private_data = p;
 	list_add(&p->op_list, &ocfs2_control_private_list);
 	mutex_unlock(&ocfs2_control_lock);
+	unlock_kernel();
 
 	return 0;
 }