summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-23 07:13:03 -0700
committerTrond Myklebust <trond.myklebust@fys.uio.no>2004-08-23 07:13:03 -0700
commit6a8e8a44eee1317f29fe1ec253303710c5f88867 (patch)
tree1466b0603e4e6523f8ffdbc7f69f0c1ea4ca54b7
parent0646a4e40f6ce8ed98d02581925e5159540284cd (diff)
Use F_SETLK instead of F_SETLK64 in nfs locking code.
The code doesn't actually _care_ about 32/64-bit issues, only about F_SETLK vs F_SETLKW, and the F_SETLK64 doesn't exist except as a compatibility thing on 64-bit architectures (since the regular one already _is_ 64-bit, of course).
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 237623f3485c..d86d640536a5 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2510,7 +2510,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *r
int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
{
- return _nfs4_do_setlk(state, F_SETLK64, request, 1);
+ return _nfs4_do_setlk(state, F_SETLK, request, 1);
}
static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)