fs, epoll: drop enabled field from fdinfo output

Once EPOLL_CTL_DISABLE get merged into mainline I'll bring "enabled" field
back.  Plain check for rdllink is not enough here and should be extended,
thus to not confuse the readers drop it for a while.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andrey Vagin <avagin@openvz.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: James Bottomley <jbottomley@parallels.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Matthew Helsley <matt.helsley@gmail.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 38cf166cbedbd2639599ed5eb42906a566a4c071..573179d2ef6c7312d2508024b5e122d7ed57d02c 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -826,10 +826,9 @@ static int ep_show_fdinfo(struct seq_file *m, struct file *f)
        for (rbp = rb_first(&ep->rbr); rbp; rbp = rb_next(rbp)) {
                struct epitem *epi = rb_entry(rbp, struct epitem, rbn);
 
-               ret = seq_printf(m, "tfd: %8d events: %8x data: %16llx enabled: %d\n",
+               ret = seq_printf(m, "tfd: %8d events: %8x data: %16llx\n",
                                 epi->ffd.fd, epi->event.events,
-                                (long long)epi->event.data,
-                                ep_is_linked(&epi->rdllink));
+                                (long long)epi->event.data);
                if (ret)
                        break;
        }