From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:28 +0000 (+0200)
Subject: ocfs2-stack_user: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b7fdf9fdd6457c9ed02099fe82bab92b0b3e291b;p=linux-2.6-omap-h63xx.git

ocfs2-stack_user: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index b503772cd0e..cd120011104 100644
--- a/fs/ocfs2/stack_user.c
+++ b/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;
 }