OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

snapshot: Push BKL down into ioctl handlers 

Push BKL down into ioctl handlers - snapshot device.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Alan Cox 2008-06-11 22:07:52 +02:00 committed by Andi Kleen
parent ebb12db51f
commit 52d11025db
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/power/user.c
View File

@ -23,6 +23,7 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -164,8 +165,8 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf,
return res; return res;
} }
static int snapshot_ioctl(struct inode *inode, struct file *filp, static long snapshot_ioctl(struct file *filp, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int error = 0; int error = 0;
struct snapshot_data *data; struct snapshot_data *data;
@ -181,6 +182,8 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
data = filp->private_data; data = filp->private_data;
lock_kernel();
switch (cmd) { switch (cmd) {
case SNAPSHOT_FREEZE: case SNAPSHOT_FREEZE:
@ -389,7 +392,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
error = -ENOTTY; error = -ENOTTY;
} }
unlock_kernel();
return error; return error;
} }
@ -399,7 +402,7 @@ static const struct file_operations snapshot_fops = {
.read = snapshot_read, .read = snapshot_read,
.write = snapshot_write, .write = snapshot_write,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = snapshot_ioctl, .unlocked_ioctl = snapshot_ioctl,
}; };
static struct miscdevice snapshot_device = { static struct miscdevice snapshot_device = {