lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 69/84] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined
    Date
    From: Oleg Drokin <green@linuxhacker.ru>

    Remove the ifdefs for the around usage.

    Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
    ---
    drivers/staging/lustre/lustre/llite/file.c | 6 ------
    1 file changed, 6 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
    index 477dc0e..2e30c52 100644
    --- a/drivers/staging/lustre/lustre/llite/file.c
    +++ b/drivers/staging/lustre/lustre/llite/file.c
    @@ -2746,21 +2746,15 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)

    switch (cmd) {
    case F_SETLKW:
    -#ifdef F_SETLKW64
    case F_SETLKW64:
    -#endif
    flags = 0;
    break;
    case F_SETLK:
    -#ifdef F_SETLK64
    case F_SETLK64:
    -#endif
    flags = LDLM_FL_BLOCK_NOWAIT;
    break;
    case F_GETLK:
    -#ifdef F_GETLK64
    case F_GETLK64:
    -#endif
    flags = LDLM_FL_TEST_LOCK;
    /* Save the old mode so that if the mode in the lock changes we
    * can decrement the appropriate reader or writer refcount.
    --
    2.1.0
    \
     
     \ /
      Last update: 2016-02-25 04:41    [W:4.104 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site