---

yaml --- r: 38777 b: refs/heads/master c: 08eac93 h: refs/heads/master i: 38775: e81eb39 v: v3
git-mirror · Aug 7, 2006 · 42f05f9 · 42f05f9
1 parent b4d697c
commit 42f05f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;