Commit f9f2ed48 authored by David Teigland's avatar David Teigland

dlm: remove bkl

BLK from recent pushdown is not needed.
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 44be6fdf
...@@ -15,7 +15,6 @@ ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment