---

yaml --- r: 30117 b: refs/heads/master c: 3134cbe h: refs/heads/master i: 30115: ea75b9a v: v3
git-mirror · Jun 9, 2006 · 18cd09d · 18cd09d
1 parent 19514f2
commit 18cd09d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81039f1f204a0fd2952112a240284e114f1a25e6
+refs/heads/master: 3134cbec5e172c3a86e2c3ef4af34b6cfd380bfa
diff --git a/trunk/include/linux/lockd/lockd.h b/trunk/include/linux/lockd/lockd.h
@@ -220,6 +220,7 @@ static __inline__ int
 nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2)
 {
 	return	fl1->fl_pid   == fl2->fl_pid
+	     && fl1->fl_owner == fl2->fl_owner
 	     && fl1->fl_start == fl2->fl_start
 	     && fl1->fl_end   == fl2->fl_end
 	     &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);