Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52d11025 authored by Alan Cox's avatar Alan Cox Committed by Andi Kleen
Browse files

snapshot: Push BKL down into ioctl handlers 



Push BKL down into ioctl handlers - snapshot device.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent ebb12db5

kernel/power/user.c

+7 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/console.h>

#include <linux/cpu.h>

#include <linux/freezer.h>

#include <linux/smp_lock.h>



#include <asm/uaccess.h>
@@ -164,8 +165,8 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, 
	return res;

}



static int snapshot_ioctl(struct inode *inode, struct file *filp,

                          unsigned int cmd, unsigned long arg)

static long snapshot_ioctl(struct file *filp, unsigned int cmd,

							unsigned long arg)

{

	int error = 0;

	struct snapshot_data *data;
@@ -181,6 +182,8 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, 


	data = filp->private_data;



	lock_kernel();



	switch (cmd) {



	case SNAPSHOT_FREEZE:
@@ -389,7 +392,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, 
		error = -ENOTTY;



	}



	unlock_kernel();

	return error;

}
@@ -399,7 +402,7 @@ static const struct file_operations snapshot_fops = { 
	.read = snapshot_read,

	.write = snapshot_write,

	.llseek = no_llseek,

	.ioctl = snapshot_ioctl,

	.unlocked_ioctl = snapshot_ioctl,

};



static struct miscdevice snapshot_device = {