Messages in this thread Patch in this message | | | Date | Wed, 06 Nov 2013 15:47:47 +0400 | From | Cyrill Gorcunov <> | Subject | [patch 5/7] signalfd: Use sequential fdinfo engine |
| |
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: Andrew Morton <akpm@linux-foundation.org> --- fs/signalfd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
Index: linux-2.6.git/fs/signalfd.c =================================================================== --- linux-2.6.git.orig/fs/signalfd.c +++ linux-2.6.git/fs/signalfd.c @@ -230,9 +230,9 @@ static ssize_t signalfd_read(struct file } #ifdef CONFIG_PROC_FS -static int signalfd_show_fdinfo(struct seq_file *m, struct file *f) +static int seq_show(struct seq_file *m, void *v) { - struct signalfd_ctx *ctx = f->private_data; + struct signalfd_ctx *ctx = ((struct file *)m->private)->private_data; sigset_t sigmask; sigmask = ctx->sigmask; @@ -241,11 +241,18 @@ static int signalfd_show_fdinfo(struct s return 0; } + +static struct seq_operations signalfd_fdinfo_op = { + .start = single_start, + .next = single_next, + .stop = single_stop, + .show = seq_show, +}; #endif static const struct file_operations signalfd_fops = { #ifdef CONFIG_PROC_FS - .show_fdinfo = signalfd_show_fdinfo, + .fdinfo_op = &signalfd_fdinfo_op, #endif .release = signalfd_release, .poll = signalfd_poll,
| |