swsusp: Fix userland interface

[linux-2.6-omap-h63xx.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 7cf6713b23252349dfab447b32336b85909f9c40..d65305b515b1ec8c359532b3f29812178fbbb6ad 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -33,25 +33,29 @@
 static struct snapshot_data {
        struct snapshot_handle handle;
        int swap;
-       struct bitmap_page *bitmap;
        int mode;
        char frozen;
        char ready;
        char platform_suspend;
 } snapshot_state;
 
-static atomic_t device_available = ATOMIC_INIT(1);
+atomic_t snapshot_device_available = ATOMIC_INIT(1);
 
 static int snapshot_open(struct inode *inode, struct file *filp)
 {
        struct snapshot_data *data;
 
-       if (!atomic_add_unless(&device_available, -1, 0))
+       if (!atomic_add_unless(&snapshot_device_available, -1, 0))
                return -EBUSY;
 
-       if ((filp->f_flags & O_ACCMODE) == O_RDWR)
+       if ((filp->f_flags & O_ACCMODE) == O_RDWR) {
+               atomic_inc(&snapshot_device_available);
                return -ENOSYS;
-
+       }
+       if(create_basic_memory_bitmaps()) {
+               atomic_inc(&snapshot_device_available);
+               return -ENOMEM;
+       }
        nonseekable_open(inode, filp);
        data = &snapshot_state;
        filp->private_data = data;
@@ -64,7 +68,6 @@ static int snapshot_open(struct inode *inode, struct file *filp)
                data->swap = -1;
                data->mode = O_WRONLY;
        }
-       data->bitmap = NULL;
        data->frozen = 0;
        data->ready = 0;
        data->platform_suspend = 0;
@@ -77,16 +80,15 @@ static int snapshot_release(struct inode *inode, struct file *filp)
        struct snapshot_data *data;
 
        swsusp_free();
+       free_basic_memory_bitmaps();
        data = filp->private_data;
-       free_all_swap_pages(data->swap, data->bitmap);
-       free_bitmap(data->bitmap);
+       free_all_swap_pages(data->swap);
        if (data->frozen) {
                mutex_lock(&pm_mutex);
                thaw_processes();
-               enable_nonboot_cpus();
                mutex_unlock(&pm_mutex);
        }
-       atomic_inc(&device_available);
+       atomic_inc(&snapshot_device_available);
        return 0;
 }
 
@@ -97,6 +99,8 @@ static ssize_t snapshot_read(struct file *filp, char __user *buf,
        ssize_t res;
 
        data = filp->private_data;
+       if (!data->ready)
+               return -ENODATA;
        res = snapshot_read_next(&data->handle, count);
        if (res > 0) {
                if (copy_to_user(buf, data_of(data->handle), res))
@@ -128,16 +132,16 @@ static inline int platform_prepare(void)
 {
        int error = 0;
 
-       if (pm_ops && pm_ops->prepare)
-               error = pm_ops->prepare(PM_SUSPEND_DISK);
+       if (hibernation_ops)
+               error = hibernation_ops->prepare();
 
        return error;
 }
 
 static inline void platform_finish(void)
 {
-       if (pm_ops && pm_ops->finish)
-               pm_ops->finish(PM_SUSPEND_DISK);
+       if (hibernation_ops)
+               hibernation_ops->finish();
 }
 
 static inline int snapshot_suspend(int platform_suspend)
@@ -243,7 +247,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                break;
 
        case SNAPSHOT_UNFREEZE:
-               if (!data->frozen)
+               if (!data->frozen || data->ready)
                        break;
                mutex_lock(&pm_mutex);
                thaw_processes();
@@ -294,14 +298,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                        error = -ENODEV;
                        break;
                }
-               if (!data->bitmap) {
-                       data->bitmap = alloc_bitmap(count_swap_pages(data->swap, 0));
-                       if (!data->bitmap) {
-                               error = -ENOMEM;
-                               break;
-                       }
-               }
-               offset = alloc_swapdev_block(data->swap, data->bitmap);
+               offset = alloc_swapdev_block(data->swap);
                if (offset) {
                        offset <<= PAGE_SHIFT;
                        error = put_user(offset, (sector_t __user *)arg);
@@ -315,13 +312,11 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                        error = -ENODEV;
                        break;
                }
-               free_all_swap_pages(data->swap, data->bitmap);
-               free_bitmap(data->bitmap);
-               data->bitmap = NULL;
+               free_all_swap_pages(data->swap);
                break;
 
        case SNAPSHOT_SET_SWAP_FILE:
-               if (!data->bitmap) {
+               if (!swsusp_swap_in_use()) {
                        /*
                         * User space encodes device types as two-byte values,
                         * so we need to recode them
@@ -391,7 +386,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                switch (arg) {
 
                case PMOPS_PREPARE:
-                       if (pm_ops && pm_ops->enter) {
+                       if (hibernation_ops) {
                                data->platform_suspend = 1;
                                error = 0;
                        } else {
@@ -402,8 +397,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                case PMOPS_ENTER:
                        if (data->platform_suspend) {
                                kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-                               error = pm_ops->enter(PM_SUSPEND_DISK);
-                               error = 0;
+                               error = hibernation_ops->enter();
                        }
                        break;
 
@@ -420,7 +414,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                break;
 
        case SNAPSHOT_SET_SWAP_AREA:
-               if (data->bitmap) {
+               if (swsusp_swap_in_use()) {
                        error = -EPERM;
                } else {
                        struct resume_swap_area swap_area;