Skip to content

Commit

Permalink
snapshot: Push BKL down into ioctl handlers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Andi Kleen committed Jul 16, 2008
1 parent ebb12db commit 52d1102
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions kernel/power/user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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;
Expand All @@ -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:
Expand Down Expand Up @@ -389,7 +392,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
error = -ENOTTY;

}

unlock_kernel();
return error;
}

Expand All @@ -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 = {
Expand Down

0 comments on commit 52d1102

Please sign in to comment.