diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-29 10:59:59 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:59 -0400 |
commit | aab407fc5c0ce63e9fd4a34a790d7290d3e116a1 (patch) | |
tree | 8ac53d05b88c74f6749461f31b4ee97a8e832ed4 /fs/proc_namespace.c | |
parent | aba809cf0944fdc5a83ef8b5864cdce2a99b2513 (diff) |
don't bother with vfsmount_lock in mounts_poll()
wake_up_interruptible/poll_wait provide sufficient barriers;
just use ACCESS_ONCE() to fetch ns->event and that's it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc_namespace.c')
-rw-r--r-- | fs/proc_namespace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 5fe34c355e85..439406e081af 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c | |||
@@ -20,15 +20,15 @@ static unsigned mounts_poll(struct file *file, poll_table *wait) | |||
20 | struct proc_mounts *p = proc_mounts(file->private_data); | 20 | struct proc_mounts *p = proc_mounts(file->private_data); |
21 | struct mnt_namespace *ns = p->ns; | 21 | struct mnt_namespace *ns = p->ns; |
22 | unsigned res = POLLIN | POLLRDNORM; | 22 | unsigned res = POLLIN | POLLRDNORM; |
23 | int event; | ||
23 | 24 | ||
24 | poll_wait(file, &p->ns->poll, wait); | 25 | poll_wait(file, &p->ns->poll, wait); |
25 | 26 | ||
26 | br_read_lock(&vfsmount_lock); | 27 | event = ACCESS_ONCE(ns->event); |
27 | if (p->m.poll_event != ns->event) { | 28 | if (p->m.poll_event != event) { |
28 | p->m.poll_event = ns->event; | 29 | p->m.poll_event = event; |
29 | res |= POLLERR | POLLPRI; | 30 | res |= POLLERR | POLLPRI; |
30 | } | 31 | } |
31 | br_read_unlock(&vfsmount_lock); | ||
32 | 32 | ||
33 | return res; | 33 | return res; |
34 | } | 34 | } |