lkml.org 
[lkml]   [2006]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 1/3] swsusp: Add ioctl for swap files support
    Date
    To be able to use swap files as suspend storage from the userland suspend
    tools we need an additional ioctl() that will allow us to provide the kernel
    with both the swap header's offset and the identification of the resume
    partition.

    The new ioctl() should be regarded as a replacement for the
    SNAPSHOT_SET_SWAP_FILE ioctl() that from now on will be considered as
    obsolete, but has to stay for backwards compatibility of the interface.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    ---
    kernel/power/power.h | 13 ++++++++++++-
    kernel/power/user.c | 31 +++++++++++++++++++++++++++++++
    2 files changed, 43 insertions(+), 1 deletion(-)

    Index: linux-2.6.18-mm1/kernel/power/power.h
    ===================================================================
    --- linux-2.6.18-mm1.orig/kernel/power/power.h
    +++ linux-2.6.18-mm1/kernel/power/power.h
    @@ -119,7 +119,18 @@ extern int snapshot_image_loaded(struct
    #define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
    #define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11)
    #define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int)
    -#define SNAPSHOT_IOC_MAXNR 12
    +#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, void *)
    +#define SNAPSHOT_IOC_MAXNR 13
    +
    +/*
    + * This structure is used to pass the values needed for the identification
    + * of the resume swap area from a user space to the kernel via the
    + * SNAPSHOT_SET_SWAP_AREA ioctl
    + */
    +struct resume_swap_area {
    + u_int16_t dev;
    + loff_t offset;
    +} __attribute__((packed));

    #define PMOPS_PREPARE 1
    #define PMOPS_ENTER 2
    Index: linux-2.6.18-mm1/kernel/power/user.c
    ===================================================================
    --- linux-2.6.18-mm1.orig/kernel/power/user.c
    +++ linux-2.6.18-mm1/kernel/power/user.c
    @@ -343,6 +343,37 @@ OutS3:
    }
    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:
    error = -ENOTTY;

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-09-29 00:21    [W:0.024 / U:212.148 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site