From caa88c26575c9be856e5a801abd121d7ff0808f8 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Fri, 26 Feb 2016 01:49:58 -0500 Subject: [PATCH] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined Remove the ifdefs for the around usage. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- 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 477dc0e7c9d5..2e30c524db3a 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.39.5