diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 19:44:44 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 19:44:44 +0100 |
commit | e4cd038a45a46ffbe06a1a72f3f15246e5b041ca (patch) | |
tree | 61b926d8644ce6c3888f6891ba44d6db6d116adb /fs/lockd/clntproc.c | |
parent | NLM: Simplify client locks (diff) | |
download | linux-e4cd038a45a46ffbe06a1a72f3f15246e5b041ca.tar.xz linux-e4cd038a45a46ffbe06a1a72f3f15246e5b041ca.zip |
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/clntproc.c')
-rw-r--r-- | fs/lockd/clntproc.c | 4 |
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) /* * Report the conflicting lock back to the application. */ - locks_copy_lock(fl, &req->a_res.lock.fl); + fl->fl_start = req->a_res.lock.fl.fl_start; + fl->fl_end = req->a_res.lock.fl.fl_start; + fl->fl_type = req->a_res.lock.fl.fl_type; fl->fl_pid = 0; } else { return nlm_stat_to_errno(req->a_res.status); |