---

yaml --- r: 231160 b: refs/heads/master c: 255c7cf h: refs/heads/master v: v3
git-mirror · Jan 4, 2011 · 6b48b65 · 6b48b65
1 parent 581bdf8
commit 6b48b65
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: c45821d263a8a5109d69a9e8942b8d65bcd5f31a
+refs/heads/master: 255c7cf810e4776ae8f1023332060459f30d8a2a
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -1399,7 +1399,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 	for (before = &inode->i_flock;
 			((fl = *before) != NULL) && IS_LEASE(fl);
 			before = &fl->fl_next) {
-		if (fl->fl_file == lease->fl_file)
+		if (fl->fl_file == filp)
 			my_before = before;
 		else if (fl->fl_type == (F_INPROGRESS | F_UNLCK))
 			/*