---

yaml --- r: 101958 b: refs/heads/master c: d67d1c7 h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · a10c28c · a10c28c
1 parent 39a8f09
commit a10c28c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2e1b09ff237c0a3687b9a804cc8bf489743cffc
+refs/heads/master: d67d1c7bf948341fd8678c8e337ec27f4b46b206
diff --git a/trunk/fs/lockd/clntproc.c b/trunk/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;