git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
fs
/
dlm
/
plock.c
diff --git
a/fs/dlm/plock.c
b/fs/dlm/plock.c
index
d6d6e37
..
78878c5
100644
(file)
--- 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