lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dlm-user: BKL pushdown

Browse Source 
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2008-05-20 19:15:48 +02:00
committed by Jonathan Corbet
parent 009228dfb6
commit 514bcc66d4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/dlm/user.c
View File

@@ -15,6 +15,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/dlm.h> #include <linux/dlm.h>
#include <linux/dlm_device.h> #include <linux/dlm_device.h>
@@ -618,13 +619,17 @@ static int device_open(struct inode *inode, struct file *file)
struct dlm_user_proc *proc; struct dlm_user_proc *proc;
struct dlm_ls *ls; struct dlm_ls *ls;
lock_kernel();
ls = dlm_find_lockspace_device(iminor(inode)); ls = dlm_find_lockspace_device(iminor(inode));
if (!ls) if (!ls) {
unlock_kernel();
return -ENOENT; return -ENOENT;
}
proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL); proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);
if (!proc) { if (!proc) {
dlm_put_lockspace(ls); dlm_put_lockspace(ls);
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
@@ -636,6 +641,7 @@ static int device_open(struct inode *inode, struct file *file)
spin_lock_init(&proc->locks_spin); spin_lock_init(&proc->locks_spin);
init_waitqueue_head(&proc->wait); init_waitqueue_head(&proc->wait);
file->private_data = proc; file->private_data = proc;
unlock_kernel();
return 0; return 0;
} }
@@ -870,6 +876,7 @@ static unsigned int device_poll(struct file *file, poll_table *wait)
static int ctl_device_open(struct inode *inode, struct file *file) static int ctl_device_open(struct inode *inode, struct file *file)
{ {
cycle_kernel_lock();
file->private_data = NULL; file->private_data = NULL;
return 0; return 0;
} }