diff options
Diffstat (limited to 'fs')
-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 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); |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ee140c53dba6..6bcbc4d676c4 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) | |||
399 | lock_kernel(); | 399 | lock_kernel(); |
400 | /* Try local locking first */ | 400 | /* Try local locking first */ |
401 | if (posix_test_lock(filp, fl, &cfl)) { | 401 | if (posix_test_lock(filp, fl, &cfl)) { |
402 | locks_copy_lock(fl, &cfl); | 402 | fl->fl_start = cfl.fl_start; |
403 | fl->fl_end = cfl.fl_end; | ||
404 | fl->fl_type = cfl.fl_type; | ||
405 | fl->fl_pid = cfl.fl_pid; | ||
403 | goto out; | 406 | goto out; |
404 | } | 407 | } |
405 | 408 | ||