[lustre-devel] [PATCH v2 69/84] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined

green at linuxhacker.ru green at linuxhacker.ru
Wed Feb 24 19:00:52 PST 2016

From: Oleg Drokin <green at linuxhacker.ru>

Remove the ifdefs for the around usage.

Signed-off-by: Oleg Drokin <green at 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:
 		flags = 0;
 	case F_SETLK:
-#ifdef F_SETLK64
 	case F_SETLK64:
 	case F_GETLK:
-#ifdef F_GETLK64
 	case F_GETLK64:
 		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.

More information about the lustre-devel mailing list