1 files changed, 82 insertions, 20 deletions

diff --git a/kernel/power/user.c b/kernel/power/user.c
index d991d3b0e5a4..89443b85163b 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -11,6 +11,7 @@
 
 #include <linux/suspend.h>
 #include <linux/syscalls.h>
+#include <linux/reboot.h>
 #include <linux/string.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
@@ -21,6 +22,7 @@
 #include <linux/fs.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 
@@ -54,7 +56,8 @@ static int snapshot_open(struct inode *inode, struct file *filp)
         filp->private_data = data;
         memset(&data->handle, 0, sizeof(struct snapshot_handle));
         if ((filp->f_flags & O_ACCMODE) == O_RDONLY) {
-                data->swap = swsusp_resume_device ? swap_type_of(swsusp_resume_device) : -1;
+                data->swap = swsusp_resume_device ?
+                                swap_type_of(swsusp_resume_device, 0) : -1;
                 data->mode = O_RDONLY;
         } else {
                 data->swap = -1;
@@ -76,10 +79,10 @@ static int snapshot_release(struct inode *inode, struct file *filp)
         free_all_swap_pages(data->swap, data->bitmap);
         free_bitmap(data->bitmap);
         if (data->frozen) {
-                down(&pm_sem);
+                mutex_lock(&pm_mutex);
                 thaw_processes();
                 enable_nonboot_cpus();
-                up(&pm_sem);
+                mutex_unlock(&pm_mutex);
         }
         atomic_inc(&device_available);
         return 0;
@@ -124,7 +127,8 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 {
         int error = 0;
         struct snapshot_data *data;
-        loff_t offset, avail;
+        loff_t avail;
+        sector_t offset;
 
         if (_IOC_TYPE(cmd) != SNAPSHOT_IOC_MAGIC)
                 return -ENOTTY;
@@ -140,7 +144,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
         case SNAPSHOT_FREEZE:
                 if (data->frozen)
                         break;
-                down(&pm_sem);
+                mutex_lock(&pm_mutex);
                 error = disable_nonboot_cpus();
                 if (!error) {
                         error = freeze_processes();
@@ -150,7 +154,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                                 error = -EBUSY;
                         }
                 }
-                up(&pm_sem);
+                mutex_unlock(&pm_mutex);
                 if (!error)
                         data->frozen = 1;
                 break;
@@ -158,10 +162,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
         case SNAPSHOT_UNFREEZE:
                 if (!data->frozen)
                         break;
-                down(&pm_sem);
+                mutex_lock(&pm_mutex);
                 thaw_processes();
                 enable_nonboot_cpus();
-                up(&pm_sem);
+                mutex_unlock(&pm_mutex);
                 data->frozen = 0;
                 break;
 
@@ -170,7 +174,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                         error = -EPERM;
                         break;
                 }
-                down(&pm_sem);
+                mutex_lock(&pm_mutex);
                 /* Free memory before shutting down devices. */
                 error = swsusp_shrink_memory();
                 if (!error) {
@@ -183,7 +187,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                         }
                         resume_console();
                 }
-                up(&pm_sem);
+                mutex_unlock(&pm_mutex);
                 if (!error)
                         error = put_user(in_suspend, (unsigned int __user *)arg);
                 if (!error)
@@ -191,13 +195,13 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 break;
 
         case SNAPSHOT_ATOMIC_RESTORE:
+                snapshot_write_finalize(&data->handle);
                 if (data->mode != O_WRONLY || !data->frozen ||
                     !snapshot_image_loaded(&data->handle)) {
                         error = -EPERM;
                         break;
                 }
-                snapshot_free_unused_memory(&data->handle);
-                down(&pm_sem);
+                mutex_lock(&pm_mutex);
                 pm_prepare_console();
                 suspend_console();
                 error = device_suspend(PMSG_PRETHAW);
@@ -207,7 +211,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 }
                 resume_console();
                 pm_restore_console();
-                up(&pm_sem);
+                mutex_unlock(&pm_mutex);
                 break;
 
         case SNAPSHOT_FREE:
@@ -238,10 +242,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                                 break;
                         }
                 }
-                offset = alloc_swap_page(data->swap, data->bitmap);
+                offset = alloc_swapdev_block(data->swap, data->bitmap);
                 if (offset) {
                         offset <<= PAGE_SHIFT;
-                        error = put_user(offset, (loff_t __user *)arg);
+                        error = put_user(offset, (sector_t __user *)arg);
                 } else {
                         error = -ENOSPC;
                 }
@@ -264,7 +268,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                          * so we need to recode them
                          */
                         if (old_decode_dev(arg)) {
-                                data->swap = swap_type_of(old_decode_dev(arg));
+                                data->swap = swap_type_of(old_decode_dev(arg), 0);
                                 if (data->swap < 0)
                                         error = -ENODEV;
                         } else {
@@ -282,7 +286,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                         break;
                 }
 
-                if (down_trylock(&pm_sem)) {
+                if (!mutex_trylock(&pm_mutex)) {
                         error = -EBUSY;
                         break;
                 }
@@ -309,8 +313,66 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 if (pm_ops->finish)
                         pm_ops->finish(PM_SUSPEND_MEM);
 
-OutS3:
-                up(&pm_sem);
+ OutS3:
+                mutex_unlock(&pm_mutex);
+                break;
+
+        case SNAPSHOT_PMOPS:
+                switch (arg) {
+
+                case PMOPS_PREPARE:
+                        if (pm_ops->prepare) {
+                                error = pm_ops->prepare(PM_SUSPEND_DISK);
+                        }
+                        break;
+
+                case PMOPS_ENTER:
+                        kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
+                        error = pm_ops->enter(PM_SUSPEND_DISK);
+                        break;
+
+                case PMOPS_FINISH:
+                        if (pm_ops && pm_ops->finish) {
+                                pm_ops->finish(PM_SUSPEND_DISK);
+                        }
+                        break;
+
+                default:
+                        printk(KERN_ERR "SNAPSHOT_PMOPS: invalid argument %ld\n", arg);
+                        error = -EINVAL;
+
+                }
+                break;
+
+        case SNAPSHOT_SET_SWAP_AREA:
+                if (data->bitmap) {
+                        error = -EPERM;
+                } else {
+                        struct resume_swap_area swap_area;
+                        dev_t swdev;
+
+                        error = copy_from_user(&swap_area, (void __user *)arg,
+                                        sizeof(struct resume_swap_area));
+                        if (error) {
+                                error = -EFAULT;
+                                break;
+                        }
+
+                        /*
+                         * User space encodes device types as two-byte values,
+                         * so we need to recode them
+                         */
+                        swdev = old_decode_dev(swap_area.dev);
+                        if (swdev) {
+                                offset = swap_area.offset;
+                                data->swap = swap_type_of(swdev, offset);
+                                if (data->swap < 0)
+                                        error = -ENODEV;
+                        } else {
+                                data->swap = -1;
+                                error = -EINVAL;
+                        }
+                }
                 break;
 
         default:
@@ -321,7 +383,7 @@ OutS3:
         return error;
 }
 
-static struct file_operations snapshot_fops = {
+static const struct file_operations snapshot_fops = {
         .open = snapshot_open,
         .release = snapshot_release,
         .read = snapshot_read,