The patch titled Subject: fdinfo: show sigmask for signalfd fd has been removed from the -mm tree. Its filename was fdinfo-show-sigmask-for-signalfd-fd.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Subject: fdinfo: show sigmask for signalfd fd Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: James Bottomley <jbottomley@xxxxxxxxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Matthew Helsley <matt.helsley@xxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/array.c | 2 +- fs/signalfd.c | 26 ++++++++++++++++++++++++++ include/linux/proc_fs.h | 3 +++ 3 files changed, 30 insertions(+), 1 deletion(-) diff -puN fs/proc/array.c~fdinfo-show-sigmask-for-signalfd-fd fs/proc/array.c --- a/fs/proc/array.c~fdinfo-show-sigmask-for-signalfd-fd +++ a/fs/proc/array.c @@ -220,7 +220,7 @@ static inline void task_state(struct seq seq_putc(m, '\n'); } -static void render_sigset_t(struct seq_file *m, const char *header, +void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set) { int i; diff -puN fs/signalfd.c~fdinfo-show-sigmask-for-signalfd-fd fs/signalfd.c --- a/fs/signalfd.c~fdinfo-show-sigmask-for-signalfd-fd +++ a/fs/signalfd.c @@ -29,6 +29,7 @@ #include <linux/anon_inodes.h> #include <linux/signalfd.h> #include <linux/syscalls.h> +#include <linux/proc_fs.h> void signalfd_cleanup(struct sighand_struct *sighand) { @@ -46,6 +47,7 @@ void signalfd_cleanup(struct sighand_str } struct signalfd_ctx { + seqcount_t cnt; sigset_t sigmask; }; @@ -227,7 +229,28 @@ static ssize_t signalfd_read(struct file return total ? total: ret; } +#ifdef CONFIG_PROC_FS +static int signalfd_show_fdinfo(struct seq_file *m, struct file *f) +{ + struct signalfd_ctx *ctx = f->private_data; + sigset_t sigmask; + unsigned seq; + + do { + seq = read_seqcount_begin(&ctx->cnt); + sigmask = ctx->sigmask; + } while (read_seqcount_retry(&ctx->cnt, seq)); + + signotset(&sigmask); + render_sigset_t(m, "sigmask:\t", &sigmask); + return 0; +} +#endif + static const struct file_operations signalfd_fops = { +#ifdef CONFIG_PROC_FS + .show_fdinfo = signalfd_show_fdinfo, +#endif .release = signalfd_release, .poll = signalfd_poll, .read = signalfd_read, @@ -259,6 +282,7 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sig return -ENOMEM; ctx->sigmask = sigmask; + seqcount_init(&ctx->cnt); /* * When we call this, the initialization must be complete, since @@ -278,7 +302,9 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sig return -EINVAL; } spin_lock_irq(¤t->sighand->siglock); + write_seqcount_begin(&ctx->cnt); ctx->sigmask = sigmask; + write_seqcount_end(&ctx->cnt); spin_unlock_irq(¤t->sighand->siglock); wake_up(¤t->sighand->signalfd_wqh); diff -puN include/linux/proc_fs.h~fdinfo-show-sigmask-for-signalfd-fd include/linux/proc_fs.h --- a/include/linux/proc_fs.h~fdinfo-show-sigmask-for-signalfd-fd +++ a/include/linux/proc_fs.h @@ -290,4 +290,7 @@ static inline struct net *PDE_NET(struct return pde->parent->data; } +#include <asm/signal.h> + +void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set); #endif /* _LINUX_PROC_FS_H */ _ Patches currently in -mm which might be from gorcunov@xxxxxxxxxx are linux-next.patch proc-check-vma-vm_file-before-dereferencing.patch procfs-add-vmflags-field-in-smaps-output-v4.patch procfs-add-vmflags-field-in-smaps-output-v4-fix.patch proc-pid-status-add-seccomp-field.patch tools-testing-selftests-kcmp-kcmp_testc-print-reason-for-failure-in-kcmp_test.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html