lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NLM: Fix nlmclnt_test to not copy private part of locks

Browse Source 
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>
This commit is contained in:
Trond Myklebust
2006-03-20 13:44:44 -05:00
parent 3a649b8846
commit e4cd038a45
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/lockd/clntproc.c
View File

@@ -434,7 +434,9 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)
/* /*
* Report the conflicting lock back to the application. * 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; fl->fl_pid = 0;
} else { } else {
return nlm_stat_to_errno(req->a_res.status); return nlm_stat_to_errno(req->a_res.status);

5
fs/nfs/file.c
View File

@@ -399,7 +399,10 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl)
lock_kernel(); lock_kernel();
/* Try local locking first */ /* Try local locking first */
if (posix_test_lock(filp, fl, &cfl)) { 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; goto out;
} }