From 42f05f9f943fada127a509a904e10ee7db3ffe6c Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Fri, 4 Aug 2006 16:19:20 -0500
Subject: [PATCH] --- yaml --- r: 38777 b: refs/heads/master c:
 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 h: refs/heads/master i:   38775:
 e81eb3982eb6640ae7ce94eaa637052a91ce5ca9 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/gfs2/locking/dlm/plock.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b87e9892b8a9..7bf8c1c3f343 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3120ec541eafc6ed19bacb395adf08c5872143bf
+refs/heads/master: 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1
diff --git a/trunk/fs/gfs2/locking/dlm/plock.c b/trunk/fs/gfs2/locking/dlm/plock.c
index e5b11f0688f6..1acb2519f439 100644
--- a/trunk/fs/gfs2/locking/dlm/plock.c
+++ b/trunk/fs/gfs2/locking/dlm/plock.c
@@ -232,7 +232,8 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
 	spin_lock(&ops_lock);
 	list_for_each_entry(op, &recv_list, list) {
 		if (op->info.fsid == info.fsid &&
-		    op->info.number == info.number) {
+		    op->info.number == info.number &&
+		    op->info.owner == info.owner) {
 			list_del_init(&op->list);
 			found = 1;
 			op->done = 1;