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 <[email protected]> CC: Pavel Emelyanov <[email protected]> CC: Oleg Nesterov <[email protected]> CC: Andrey Vagin <[email protected]> CC: Al Viro <[email protected]> CC: Alexey Dobriyan <[email protected]> CC: Andrew Morton <[email protected]> CC: James Bottomley <[email protected]> CC: "Aneesh Kumar K.V" <[email protected]> CC: Alexey Dobriyan <[email protected]> CC: Matthew Helsley <[email protected]> CC: "J. Bruce Fields" <[email protected]> CC: "Aneesh Kumar K.V" <[email protected]> CC: Tvrtko Ursulin <[email protected]> --- 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
