aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2008-05-20 13:16:28 -0400
committerJonathan Corbet <corbet@lwn.net>2008-07-02 17:06:23 -0400
commitb7fdf9fdd6457c9ed02099fe82bab92b0b3e291b (patch)
treed35a977d782982fc49a4ca86bea37195c5502ecf
parent930ab4e532623795f934467c452a8c71be2c30fe (diff)
ocfs2-stack_user: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--fs/ocfs2/stack_user.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index b503772cd0ec..cd120011104d 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -21,6 +21,7 @@
21#include <linux/fs.h> 21#include <linux/fs.h>
22#include <linux/miscdevice.h> 22#include <linux/miscdevice.h>
23#include <linux/mutex.h> 23#include <linux/mutex.h>
24#include <linux/smp_lock.h>
24#include <linux/reboot.h> 25#include <linux/reboot.h>
25#include <asm/uaccess.h> 26#include <asm/uaccess.h>
26 27
@@ -619,10 +620,12 @@ static int ocfs2_control_open(struct inode *inode, struct file *file)
619 return -ENOMEM; 620 return -ENOMEM;
620 p->op_this_node = -1; 621 p->op_this_node = -1;
621 622
623 lock_kernel();
622 mutex_lock(&ocfs2_control_lock); 624 mutex_lock(&ocfs2_control_lock);
623 file->private_data = p; 625 file->private_data = p;
624 list_add(&p->op_list, &ocfs2_control_private_list); 626 list_add(&p->op_list, &ocfs2_control_private_list);
625 mutex_unlock(&ocfs2_control_lock); 627 mutex_unlock(&ocfs2_control_lock);
628 unlock_kernel();
626 629
627 return 0; 630 return 0;
628} 631}