Messages in this thread Patch in this message | | | Date | Fri, 23 Nov 2012 01:15:24 +0400 | From | Cyrill Gorcunov <> | Subject | [patch -mm 2/4] 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: Andrew Morton <akpm@linux-foundation.org> 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> --- fs/eventpoll.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Index: linux-2.6.git/fs/eventpoll.c =================================================================== --- linux-2.6.git.orig/fs/eventpoll.c +++ linux-2.6.git/fs/eventpoll.c @@ -796,10 +796,9 @@ static int ep_show_fdinfo(struct seq_fil 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; }
| |