lkml.org 
[lkml]   [2009]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2] fcntl: Use consistent values for F_[GS]ETOWN_EX
    These values were only introduced during this release cycle, so it is
    still early enough to get them right.

    alpha uses the same values that are in asm-generic/fcntl.h, so just
    remove them.

    parisc uses the values interchanged for no apparent reason, so remove them
    to give us consistency across all architectures.

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    arch/alpha/include/asm/fcntl.h | 2 --
    arch/parisc/include/asm/fcntl.h | 2 --
    include/asm-generic/fcntl.h | 2 --
    3 files changed, 0 insertions(+), 6 deletions(-)

    Ulrich pointed out that using F_LINUX_SPECIFIC_BASE for these make code
    less efficient when these values are used in switch statements.

    diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h
    index 73126e4..25da001 100644
    --- a/arch/alpha/include/asm/fcntl.h
    +++ b/arch/alpha/include/asm/fcntl.h
    @@ -26,8 +26,6 @@
    #define F_GETOWN 6 /* for sockets. */
    #define F_SETSIG 10 /* for sockets. */
    #define F_GETSIG 11 /* for sockets. */
    -#define F_SETOWN_EX 15
    -#define F_GETOWN_EX 16

    /* for posix fcntl() and lockf() */
    #define F_RDLCK 1
    diff --git a/arch/parisc/include/asm/fcntl.h b/arch/parisc/include/asm/fcntl.h
    index 5f39d55..1e1c824 100644
    --- a/arch/parisc/include/asm/fcntl.h
    +++ b/arch/parisc/include/asm/fcntl.h
    @@ -28,8 +28,6 @@
    #define F_SETOWN 12 /* for sockets. */
    #define F_SETSIG 13 /* for sockets. */
    #define F_GETSIG 14 /* for sockets. */
    -#define F_GETOWN_EX 15
    -#define F_SETOWN_EX 16

    /* for posix fcntl() and lockf() */
    #define F_RDLCK 01
    diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
    index cd2d789..c6f3926 100644
    --- a/include/asm-generic/fcntl.h
    +++ b/include/asm-generic/fcntl.h
    @@ -82,10 +82,8 @@
    #endif
    #endif

    -#ifndef F_SETOWN_EX
    #define F_SETOWN_EX 15
    #define F_GETOWN_EX 16
    -#endif

    #define F_OWNER_TID 0
    #define F_OWNER_PID 1
    --
    1.6.5.2
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/


    \
     
     \ /
      Last update: 2009-11-14 10:47    [W:0.024 / U:29.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site