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
Merge tag 'gemini-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
[sfrench/cifs-2.6.git]
/
fs
/
proc_namespace.c
diff --git
a/fs/proc_namespace.c
b/fs/proc_namespace.c
index c8528d587e09d3e856a39c848b998add4a29d7ed..e16fb8f2049e76dafdd533158fa534dc321d6dbc 100644
(file)
--- a/
fs/proc_namespace.c
+++ b/
fs/proc_namespace.c
@@
-23,7
+23,7
@@
static __poll_t mounts_poll(struct file *file, poll_table *wait)
struct seq_file *m = file->private_data;
struct proc_mounts *p = m->private;
struct mnt_namespace *ns = p->ns;
struct seq_file *m = file->private_data;
struct proc_mounts *p = m->private;
struct mnt_namespace *ns = p->ns;
- __poll_t res =
POLLIN |
POLLRDNORM;
+ __poll_t res =
EPOLLIN | E
POLLRDNORM;
int event;
poll_wait(file, &p->ns->poll, wait);
int event;
poll_wait(file, &p->ns->poll, wait);
@@
-31,7
+31,7
@@
static __poll_t mounts_poll(struct file *file, poll_table *wait)
event = READ_ONCE(ns->event);
if (m->poll_event != event) {
m->poll_event = event;
event = READ_ONCE(ns->event);
if (m->poll_event != event) {
m->poll_event = event;
- res |=
POLLERR |
POLLPRI;
+ res |=
EPOLLERR | E
POLLPRI;
}
return res;
}
return res;