redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

dlm: remove bkl

Browse source 
BLK from recent pushdown is not needed.

Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
David Teigland 2008-09-04 12:51:20 -05:00
parent 44be6fdf10
commit f9f2ed4862
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/dlm/user.c
View file

@ -15,7 +15,6 @@
#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>
@ -637,17 +636,13 @@ 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;
} }
@ -659,7 +654,6 @@ 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;
} }
@ -914,7 +908,6 @@ int dlm_user_daemon_available(void)
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;
} }