All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@openvz.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Pavel Emelyanov <xemul@parallels.com>,
	James Bottomley <jbottomley@parallels.com>,
	Matthew Helsley <matt.helsley@gmail.com>,
	aneesh.kumar@linux.vnet.ibm.com, bfields@fieldses.org,
	oleg@redhat.com, rientjes@google.com,
	tvrtko.ursulin@onelan.co.uk, linux-kernel@vger.kernel.org,
	Cyrill Gorcunov <gorcunov@openvz.org>,
	Andrey Vagin <avagin@openvz.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: [patch -mm 2/4] fs, epoll: Drop enabled field from fdinfo output
Date: Fri, 23 Nov 2012 01:15:24 +0400	[thread overview]
Message-ID: <20121122212235.530474802@openvz.org> (raw)
In-Reply-To: 20121122211522.075455799@openvz.org

[-- Attachment #1: seq-fdinfo-eventpoll-update --]
[-- Type: text/plain, Size: 1586 bytes --]

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;
 	}


  parent reply	other threads:[~2012-11-22 21:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-22 21:15 [patch -mm 0/4] Fixes for fdinfo output and docs Cyrill Gorcunov
2012-11-22 21:15 ` [patch -mm 1/4] fs, notify: Add missing space after prefix Cyrill Gorcunov
2012-11-22 21:15 ` Cyrill Gorcunov [this message]
2012-11-22 21:15 ` [patch -mm 3/4] fs, notify: Dont forget to provide fhandle for inode fanotify Cyrill Gorcunov
2012-11-22 21:15 ` [patch -mm 4/4] docs: Add documentation about /proc/<pid>/fdinfo/<fd> output Cyrill Gorcunov
2012-11-27 22:47   ` Andrew Morton
2012-11-28  6:40     ` Cyrill Gorcunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121122212235.530474802@openvz.org \
    --to=gorcunov@openvz.org \
    --cc=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=avagin@openvz.org \
    --cc=bfields@fieldses.org \
    --cc=jbottomley@parallels.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.helsley@gmail.com \
    --cc=oleg@redhat.com \
    --cc=rientjes@google.com \
    --cc=tvrtko.ursulin@onelan.co.uk \
    --cc=viro@zeniv.linux.org.uk \
    --cc=xemul@parallels.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.