From: Felix Blyakher Date: Tue, 15 Jul 2008 17:40:22 +0000 (-0500) Subject: nfs: set correct fl_len in nlmclnt_test() X-Git-Tag: v2.6.27-rc1~1052^2~1^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d67d1c7bf948341fd8678c8e337ec27f4b46b206;p=linux-2.6-omap-h63xx.git 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: Felix Blyakher Signed-off-by: "J. Bruce Fields" Signed-off-by: Trond Myklebust --- diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 5df517b81f3..fd7d4669776 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -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;