diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:44 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:44 -0500 |
| commit | e4cd038a45a46ffbe06a1a72f3f15246e5b041ca (patch) | |
| tree | 61b926d8644ce6c3888f6891ba44d6db6d116adb | |
| parent | 3a649b884637c4fdff50a6beebc3dc0e6082e048 (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>
| -rw-r--r-- | fs/lockd/clntproc.c | 4 | ||||
| -rw-r--r-- | fs/nfs/file.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 8af01710585..7a239864b8b 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); 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; } |