aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-09-04 13:51:20 -0400
committerDavid Teigland <teigland@redhat.com>2008-09-04 13:55:13 -0400
commitf9f2ed486256f3480e4d499ffd6bf730bc5e6fc6 (patch)
treeadb359d0462f3d99451c15e98a8e4d7796677ddb
parent44be6fdf1056b685eb79e53e42bd2d321b085cfc (diff)
dlm: remove bkl
BLK from recent pushdown is not needed. Signed-off-by: David Teigland <teigland@redhat.com>
-rw-r--r--fs/dlm/user.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 81627b502a56..b3832c67194a 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -15,7 +15,6 @@
15#include <linux/poll.h> 15#include <linux/poll.h>
16#include <linux/signal.h> 16#include <linux/signal.h>
17#include <linux/spinlock.h> 17#include <linux/spinlock.h>
18#include <linux/smp_lock.h>
19#include <linux/dlm.h> 18#include <linux/dlm.h>
20#include <linux/dlm_device.h> 19#include <linux/dlm_device.h>
21 20
@@ -637,17 +636,13 @@ static int device_open(struct inode *inode, struct file *file)
637 struct dlm_user_proc *proc; 636 struct dlm_user_proc *proc;
638 struct dlm_ls *ls; 637 struct dlm_ls *ls;
639 638
640 lock_kernel();
641 ls = dlm_find_lockspace_device(iminor(inode)); 639 ls = dlm_find_lockspace_device(iminor(inode));
642 if (!ls) { 640 if (!ls)
643 unlock_kernel();
644 return -ENOENT; 641 return -ENOENT;
645 }
646 642
647 proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL); 643 proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);
648 if (!proc) { 644 if (!proc) {
649 dlm_put_lockspace(ls); 645 dlm_put_lockspace(ls);
650 unlock_kernel();
651 return -ENOMEM; 646 return -ENOMEM;
652 } 647 }
653 648
@@ -659,7 +654,6 @@ static int device_open(struct inode *inode, struct file *file)
659 spin_lock_init(&proc->locks_spin); 654 spin_lock_init(&proc->locks_spin);
660 init_waitqueue_head(&proc->wait); 655 init_waitqueue_head(&proc->wait);
661 file->private_data = proc; 656 file->private_data = proc;
662 unlock_kernel();
663 657
664 return 0; 658 return 0;
665} 659}
@@ -914,7 +908,6 @@ int dlm_user_daemon_available(void)
914 908
915static int ctl_device_open(struct inode *inode, struct file *file) 909static int ctl_device_open(struct inode *inode, struct file *file)
916{ 910{
917 cycle_kernel_lock();
918 file->private_data = NULL; 911 file->private_data = NULL;
919 return 0; 912 return 0;
920} 913}