aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Drokin <green@linuxhacker.ru>2016-02-26 01:49:58 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-01 19:17:41 -0800
commitcaa88c26575c9be856e5a801abd121d7ff0808f8 (patch)
treee9b10e0ee6df7b1d0b74543c8835ae669c58f89a
parentstaging/lustre/lmv: Remove commented out MDS selection policies (diff)
staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined
Remove the ifdefs for the around usage. Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/llite/file.c6
1 files changed, 0 insertions, 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.