From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 Mar 2016 20:06:42 +0000 (-0800)
Subject: Revert "staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2faedcd5b3d0838e8a612e3f7fd70d84113360dd;p=openwrt%2Fstaging%2Fblogic.git

Revert "staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined"

This reverts commit caa88c26575c9be856e5a801abd121d7ff0808f8.

Turns out that Alpha doesn't define these values :(

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: 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 d4971cc113fc..d3ed905fd214 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -2746,15 +2746,21 @@ 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.