aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-07-12 14:48:39 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 20:47:50 -0400
commitf15146380d28b746df3c8b81b392812eb982382a (patch)
treebf43b38b60c21bd01b007c9636062783d406eb29 /fs
parent72c5052ddc3956d847f21c2b8d55c93664a51b2c (diff)
fs: seq_file - add event counter to simplify poll() support
Moving the event counter into the dynamically allocated 'struc seq_file' allows poll() support without the need to allocate its own tracking structure. All current users are switched over to use the new counter. Requested-by: Andrew Morton akpm@linux-foundation.org Acked-by: NeilBrown <neilb@suse.de> Tested-by: Lucas De Marchi lucas.demarchi@profusion.mobi Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c4
-rw-r--r--fs/proc/base.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index fe59bd145d21..cda50fe9250a 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -934,8 +934,8 @@ int mnt_had_events(struct proc_mounts *p)
934 int res = 0; 934 int res = 0;
935 935
936 br_read_lock(vfsmount_lock); 936 br_read_lock(vfsmount_lock);
937 if (p->event != ns->event) { 937 if (p->m.poll_event != ns->event) {
938 p->event = ns->event; 938 p->m.poll_event = ns->event;
939 res = 1; 939 res = 1;
940 } 940 }
941 br_read_unlock(vfsmount_lock); 941 br_read_unlock(vfsmount_lock);
diff --git a/fs/proc/base.c b/fs/proc/base.c
index be1ff932033b..3dc5e2a5cc38 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -673,7 +673,7 @@ static int mounts_open_common(struct inode *inode, struct file *file,
673 p->m.private = p; 673 p->m.private = p;
674 p->ns = ns; 674 p->ns = ns;
675 p->root = root; 675 p->root = root;
676 p->event = ns->event; 676 p->m.poll_event = ns->event;
677 677
678 return 0; 678 return 0;
679 679