summaryrefslogtreecommitdiffstats
path: root/fs/dlm/plock.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-05-13 14:28:26 -0500
committerDavid Teigland <teigland@redhat.com>2008-05-19 15:37:27 -0500
commit817d10bad56f2fdfa321b4a864a21295226b123a (patch)
treea8072d7f82e04a88ea37f474661e33f45c112e15 /fs/dlm/plock.c
parent0035a4b14931eb62a5f8a7762284c18e7ab14289 (diff)
downloadlinux-stable-817d10bad56f2fdfa321b4a864a21295226b123a.tar.gz
linux-stable-817d10bad56f2fdfa321b4a864a21295226b123a.tar.bz2
linux-stable-817d10bad56f2fdfa321b4a864a21295226b123a.zip
dlm: fix plock dev_write return value
The return value on writes to the plock device should be the number of bytes written. It was returning 0 instead when an nfs lock callback was involved. Reported-by: Nathan Straz <nstraz@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/plock.c')
-rw-r--r--fs/dlm/plock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index d6d6e370f89c..78878c5781ca 100644
--- a/fs/dlm/plock.c
+++ b/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