diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 23:06:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 23:06:42 +0300 |
| commit | 2faedcd5b3d0838e8a612e3f7fd70d84113360dd (patch) | |
| tree | 306035031eb793adab8a945230d07c42feb8b1d1 | |
| parent | 5a9ff74d8e681f9ac6af6cc1444a812b74e7c2de (diff) | |
| download | linux-2faedcd5b3d0838e8a612e3f7fd70d84113360dd.tar.xz | |
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>
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/file.c | 6 |
1 files changed, 6 insertions, 0 deletions
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. |