dlm: remove bkl (f9f2ed48) · Commits · e / devices / android_kernel_teracube_emerald

fs/dlm/user.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -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>

		@@ -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;
		}

		@@ -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;
		}
		@@ -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;
		}