git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
btrfs: don't run delayed_iputs in commit
[sfrench/cifs-2.6.git]
/
fs
/
dlm
/
plock.c
diff --git
a/fs/dlm/plock.c
b/fs/dlm/plock.c
index a4c63e9e638545a916fd1d25ed8058e1d77acad9..c7d5a2ea3d030ed37e1c35441d6a24fdc065c1cd 100644
(file)
--- a/
fs/dlm/plock.c
+++ b/
fs/dlm/plock.c
@@
-471,7
+471,7
@@
static __poll_t dev_poll(struct file *file, poll_table *wait)
spin_lock(&ops_lock);
if (!list_empty(&send_list))
- mask =
POLLIN |
POLLRDNORM;
+ mask =
EPOLLIN | E
POLLRDNORM;
spin_unlock(&ops_lock);
return mask;