From 18cd09d509871e7ff208d879e2a69afade9b5eb4 Mon Sep 17 00:00:00 2001
From: Marc Eshel <eshel@almaden.ibm.com>
Date: Fri, 9 Jun 2006 09:40:20 -0400
Subject: [PATCH] --- yaml --- r: 30117 b: refs/heads/master c:
 3134cbec5e172c3a86e2c3ef4af34b6cfd380bfa h: refs/heads/master i:   30115:
 ea75b9a46de363c10f85eb74e3d92388f7d10aea v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/lockd/lockd.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c6601f63bab..addbd988339d 100644
--- 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
index 995f89dc8c04..112936fcda80 100644
--- 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);