From: Oleg Drokin <green@linuxhacker.ru>
Date: Fri, 26 Feb 2016 06:49:58 +0000 (-0500)
Subject: staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined
X-Git-Tag: v4.6-rc1~103^2~396
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=caa88c26575c9be856e5a801abd121d7ff0808f8;p=cascardo%2Flinux.git

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>
---

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.