Skip to content

Commit

Permalink
dlm: remove bkl
Browse files Browse the repository at this point in the history
BLK from recent pushdown is not needed.

Signed-off-by: David Teigland <teigland@redhat.com>
  • Loading branch information
David Teigland committed Sep 4, 2008
1 parent 44be6fd commit f9f2ed4
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions fs/dlm/user.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <linux/poll.h>
#include <linux/signal.h>
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/dlm.h>
#include <linux/dlm_device.h>

Expand Down Expand Up @@ -637,17 +636,13 @@ static int device_open(struct inode *inode, struct file *file)
struct dlm_user_proc *proc;
struct dlm_ls *ls;

lock_kernel();
ls = dlm_find_lockspace_device(iminor(inode));
if (!ls) {
unlock_kernel();
if (!ls)
return -ENOENT;
}

proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);
if (!proc) {
dlm_put_lockspace(ls);
unlock_kernel();
return -ENOMEM;
}

Expand All @@ -659,7 +654,6 @@ static int device_open(struct inode *inode, struct file *file)
spin_lock_init(&proc->locks_spin);
init_waitqueue_head(&proc->wait);
file->private_data = proc;
unlock_kernel();

return 0;
}
Expand Down Expand Up @@ -914,7 +908,6 @@ int dlm_user_daemon_available(void)

static int ctl_device_open(struct inode *inode, struct file *file)
{
cycle_kernel_lock();
file->private_data = NULL;
return 0;
}
Expand Down

0 comments on commit f9f2ed4

Please sign in to comment.