aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
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/lockd
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/lockd')
-rw-r--r--fs/lockd/clntproc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 8af017105854..7a239864b8bf 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -434,7 +434,9 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)
434 /* 434 /*
435 * Report the conflicting lock back to the application. 435 * Report the conflicting lock back to the application.
436 */ 436 */
437 locks_copy_lock(fl, &req->a_res.lock.fl); 437 fl->fl_start = req->a_res.lock.fl.fl_start;
438 fl->fl_end = req->a_res.lock.fl.fl_start;
439 fl->fl_type = req->a_res.lock.fl.fl_type;
438 fl->fl_pid = 0; 440 fl->fl_pid = 0;
439 } else { 441 } else {
440 return nlm_stat_to_errno(req->a_res.status); 442 return nlm_stat_to_errno(req->a_res.status);