projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
signalfd.c
diff --git
a/fs/signalfd.c
b/fs/signalfd.c
index 424b7b65321fecbe2afff24cb3f3f69dfa81bc26..7e412ad748363489baad12cbb644b8074d78cfeb 100644
(file)
--- a/
fs/signalfd.c
+++ b/
fs/signalfd.c
@@
-230,7
+230,7
@@
static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
}
#ifdef CONFIG_PROC_FS
}
#ifdef CONFIG_PROC_FS
-static
int
signalfd_show_fdinfo(struct seq_file *m, struct file *f)
+static
void
signalfd_show_fdinfo(struct seq_file *m, struct file *f)
{
struct signalfd_ctx *ctx = f->private_data;
sigset_t sigmask;
{
struct signalfd_ctx *ctx = f->private_data;
sigset_t sigmask;
@@
-238,8
+238,6
@@
static int signalfd_show_fdinfo(struct seq_file *m, struct file *f)
sigmask = ctx->sigmask;
signotset(&sigmask);
render_sigset_t(m, "sigmask:\t", &sigmask);
sigmask = ctx->sigmask;
signotset(&sigmask);
render_sigset_t(m, "sigmask:\t", &sigmask);
-
- return 0;
}
#endif
}
#endif