summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-02-05 00:40:25 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2010-03-03 14:07:59 -0500
commit9f5596af44514f99e3a654a4f7cb813354b9e516 (patch)
tree6a579bf387683b910bd32e8aa7edef9956e58dd1
parente21e7095a78867364d7aa9223d833ccb966f93f3 (diff)
downloadlinux-3.10-9f5596af44514f99e3a654a4f7cb813354b9e516.tar.gz
linux-3.10-9f5596af44514f99e3a654a4f7cb813354b9e516.tar.bz2
linux-3.10-9f5596af44514f99e3a654a4f7cb813354b9e516.zip
take check for new events in namespace (guts of mounts_poll()) to namespace.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namespace.c15
-rw-r--r--fs/proc/base.c10
-rw-r--r--include/linux/mnt_namespace.h1
3 files changed, 18 insertions, 8 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index d5906c19e08..970fe79d786 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -737,6 +737,21 @@ static void m_stop(struct seq_file *m, void *v)
up_read(&namespace_sem);
}
+int mnt_had_events(struct proc_mounts *p)
+{
+ struct mnt_namespace *ns = p->ns;
+ int res = 0;
+
+ spin_lock(&vfsmount_lock);
+ if (p->event != ns->event) {
+ p->event = ns->event;
+ res = 1;
+ }
+ spin_unlock(&vfsmount_lock);
+
+ return res;
+}
+
struct proc_fs_info {
int flag;
const char *str;
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 58324c29916..746895ddfda 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -647,17 +647,11 @@ static int mounts_release(struct inode *inode, struct file *file)
static unsigned mounts_poll(struct file *file, poll_table *wait)
{
struct proc_mounts *p = file->private_data;
- struct mnt_namespace *ns = p->ns;
unsigned res = POLLIN | POLLRDNORM;
- poll_wait(file, &ns->poll, wait);
-
- spin_lock(&vfsmount_lock);
- if (p->event != ns->event) {
- p->event = ns->event;
+ poll_wait(file, &p->ns->poll, wait);
+ if (mnt_had_events(p))
res |= POLLERR | POLLPRI;
- }
- spin_unlock(&vfsmount_lock);
return res;
}
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index d74785c2393..0b89efc6f21 100644
--- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h
@@ -35,6 +35,7 @@ static inline void get_mnt_ns(struct mnt_namespace *ns)
extern const struct seq_operations mounts_op;
extern const struct seq_operations mountinfo_op;
extern const struct seq_operations mountstats_op;
+extern int mnt_had_events(struct proc_mounts *);
#endif
#endif