mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-18 16:44:33 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
This reverts commit caa88c2657.

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>
This commit is contained in:
Greg Kroah-Hartman 2016-03-02 12:06:42 -08:00
parent 5a9ff74d8e
commit 2faedcd5b3
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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