From 689d6f48901a718def98d9764cf365859d9c9328 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Tue, 13 May 2008 14:28:26 -0500
Subject: [PATCH] --- yaml --- r: 96928 b: refs/heads/master c:
 817d10bad56f2fdfa321b4a864a21295226b123a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cfee274f2a16..d53a7828819b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0035a4b14931eb62a5f8a7762284c18e7ab14289
+refs/heads/master: 817d10bad56f2fdfa321b4a864a21295226b123a
diff --git a/trunk/fs/dlm/plock.c b/trunk/fs/dlm/plock.c
index d6d6e370f89c..78878c5781ca 100644
--- a/trunk/fs/dlm/plock.c
+++ b/trunk/fs/dlm/plock.c
@@ -379,7 +379,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
 		struct plock_xop *xop;
 		xop = (struct plock_xop *)op;
 		if (xop->callback)
-			count = dlm_plock_callback(op);
+			dlm_plock_callback(op);
 		else
 			wake_up(&recv_wq);
 	} else