aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 13:44:44 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 13:44:44 -0500
commite4cd038a45a46ffbe06a1a72f3f15246e5b041ca (patch)
tree61b926d8644ce6c3888f6891ba44d6db6d116adb /fs/nfs/file.c
parent3a649b884637c4fdff50a6beebc3dc0e6082e048 (diff)
NLM: Fix nlmclnt_test to not copy private part of locks
The struct file_lock does not carry a properly initialised lock, so don't copy it as if it were. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ee140c53dba..6bcbc4d676c 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -399,7 +399,10 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl)
lock_kernel();
/* Try local locking first */
if (posix_test_lock(filp, fl, &cfl)) {
- locks_copy_lock(fl, &cfl);
+ fl->fl_start = cfl.fl_start;
+ fl->fl_end = cfl.fl_end;
+ fl->fl_type = cfl.fl_type;
+ fl->fl_pid = cfl.fl_pid;
goto out;
}