Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2faedcd5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit caa88c26.

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

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a9ff74d

drivers/staging/lustre/lustre/llite/file.c

+6 −0
Original line number Diff line number Diff line
@@ -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.