lkml.org 
[lkml]   [2007]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 3/5] Hibernation: Mark SNAPSHOT_SET_SWAP_FILE ioctl as deprecated (rev. 2)
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Mark the SNAPSHOT_SET_SWAP_FILE ioctl belonging to the hibernation userland
    interface as deprecated.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    ---
    Documentation/power/userland-swsusp.txt | 14 ++------------
    kernel/power/power.h | 1 -
    kernel/power/user.c | 9 +++++----
    3 files changed, 7 insertions(+), 17 deletions(-)

    Index: linux-2.6.23-rc5/kernel/power/power.h
    ===================================================================
    --- linux-2.6.23-rc5.orig/kernel/power/power.h 2007-09-09 22:30:21.000000000 +0200
    +++ linux-2.6.23-rc5/kernel/power/power.h 2007-09-09 22:30:36.000000000 +0200
    @@ -156,7 +156,6 @@ struct resume_swap_area {
    #define SNAPSHOT_AVAIL_SWAP _IOR(SNAPSHOT_IOC_MAGIC, 7, void *)
    #define SNAPSHOT_GET_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 8, void *)
    #define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9)
    -#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
    #define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11)
    #define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \
    struct resume_swap_area)
    Index: linux-2.6.23-rc5/kernel/power/user.c
    ===================================================================
    --- linux-2.6.23-rc5.orig/kernel/power/user.c 2007-09-09 22:30:21.000000000 +0200
    +++ linux-2.6.23-rc5/kernel/power/user.c 2007-09-09 22:30:36.000000000 +0200
    @@ -29,10 +29,11 @@
    #include "power.h"

    /*
    - * NOTE: The SNAPSHOT_PMOPS ioctl is obsolete and will be removed in the
    - * future. It is only preserved here for compatibility with existing userland
    - * utilities.
    + * NOTE: The SNAPSHOT_SET_SWAP_FILE and SNAPSHOT_PMOPS ioctls are obsolete and
    + * will be removed in the future. They are only preserved here for
    + * compatibility with existing userland utilities.
    */
    +#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
    #define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int)

    #define PMOPS_PREPARE 1
    @@ -260,7 +261,7 @@ static int snapshot_ioctl(struct inode *
    free_all_swap_pages(data->swap);
    break;

    - case SNAPSHOT_SET_SWAP_FILE:
    + case SNAPSHOT_SET_SWAP_FILE: /* This ioctl is deprecated */
    if (!swsusp_swap_in_use()) {
    /*
    * User space encodes device types as two-byte values,
    Index: linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt
    ===================================================================
    --- linux-2.6.23-rc5.orig/Documentation/power/userland-swsusp.txt 2007-09-09 22:30:21.000000000 +0200
    +++ linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt 2007-09-09 22:32:45.000000000 +0200
    @@ -67,23 +67,13 @@ SNAPSHOT_GET_SWAP_PAGE - allocate a swap
    SNAPSHOT_FREE_SWAP_PAGES - free all swap pages allocated with
    SNAPSHOT_GET_SWAP_PAGE

    -SNAPSHOT_SET_SWAP_FILE - set the resume partition (the last ioctl() argument
    - should specify the device's major and minor numbers in the old
    - two-byte format, as returned by the stat() function in the .st_rdev
    - member of the stat structure)
    -
    SNAPSHOT_SET_SWAP_AREA - set the resume partition and the offset (in <PAGE_SIZE>
    units) from the beginning of the partition at which the swap header is
    located (the last ioctl() argument should point to a struct
    resume_swap_area, as defined in kernel/power/power.h, containing the
    - resume device specification, as for the SNAPSHOT_SET_SWAP_FILE ioctl(),
    - and the offset); for swap partitions the offset is always 0, but it is
    - different to zero for swap files (please see
    + resume device specification and the offset); for swap partitions the
    + offset is always 0, but it is different from zero for swap files (see
    Documentation/swsusp-and-swap-files.txt for details).
    - The SNAPSHOT_SET_SWAP_AREA ioctl() is considered as a replacement for
    - SNAPSHOT_SET_SWAP_FILE which is regarded as obsolete. It is
    - recommended to always use this call, because the code to set the resume
    - partition may be removed from future kernels

    SNAPSHOT_PLATFORM_SUPPORT - enable/disable the hibernation platform support,
    depending on the argument value (enable, if the argument is nonzero)
    -
    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: 2007-09-09 23:15    [W:5.573 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site