Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dlm: remove bkl

BLK from recent pushdown is not needed.

Signed-off-by: David Teigland <teigland@redhat.com>

+1 -8
+1 -8
fs/dlm/user.c
··· 15 15 #include <linux/poll.h> 16 16 #include <linux/signal.h> 17 17 #include <linux/spinlock.h> 18 - #include <linux/smp_lock.h> 19 18 #include <linux/dlm.h> 20 19 #include <linux/dlm_device.h> 21 20 ··· 636 637 struct dlm_user_proc *proc; 637 638 struct dlm_ls *ls; 638 639 639 - lock_kernel(); 640 640 ls = dlm_find_lockspace_device(iminor(inode)); 641 - if (!ls) { 642 - unlock_kernel(); 641 + if (!ls) 643 642 return -ENOENT; 644 - } 645 643 646 644 proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL); 647 645 if (!proc) { 648 646 dlm_put_lockspace(ls); 649 - unlock_kernel(); 650 647 return -ENOMEM; 651 648 } 652 649 ··· 654 659 spin_lock_init(&proc->locks_spin); 655 660 init_waitqueue_head(&proc->wait); 656 661 file->private_data = proc; 657 - unlock_kernel(); 658 662 659 663 return 0; 660 664 } ··· 908 914 909 915 static int ctl_device_open(struct inode *inode, struct file *file) 910 916 { 911 - cycle_kernel_lock(); 912 917 file->private_data = NULL; 913 918 return 0; 914 919 }