Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d67d1c7b authored by Felix Blyakher's avatar Felix Blyakher Committed by Trond Myklebust
Browse files

nfs: set correct fl_len in nlmclnt_test() 



fcntl(F_GETLK) on an nfs client incorrectly returns
the values for the conflicting lock. fl_len value is
always 1.
If the conflicting lock is (0, 4095) the F_GETLK
request for (1024, 10) returns (0, 1), which doesn't
even cover the requested range, and is quite confusing.
The fix is trivial, set fl_end from the fl_end value
recieved from the nfs server.

Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c2e1b09f

fs/lockd/clntproc.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl) 
			 * Report the conflicting lock back to the application.

			 */

			fl->fl_start = req->a_res.lock.fl.fl_start;

			fl->fl_end = req->a_res.lock.fl.fl_start;

			fl->fl_end = req->a_res.lock.fl.fl_end;

			fl->fl_type = req->a_res.lock.fl.fl_type;

			fl->fl_pid = 0;

			break;