projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
fs
/
eventfd.c
diff --git
a/fs/eventfd.c
b/fs/eventfd.c
index
d6a88e7
..
4b0a226
100644
(file)
--- a/
fs/eventfd.c
+++ b/
fs/eventfd.c
@@
-287,17
+287,14
@@
static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c
}
#ifdef CONFIG_PROC_FS
}
#ifdef CONFIG_PROC_FS
-static
int
eventfd_show_fdinfo(struct seq_file *m, struct file *f)
+static
void
eventfd_show_fdinfo(struct seq_file *m, struct file *f)
{
struct eventfd_ctx *ctx = f->private_data;
{
struct eventfd_ctx *ctx = f->private_data;
- int ret;
spin_lock_irq(&ctx->wqh.lock);
spin_lock_irq(&ctx->wqh.lock);
-
ret =
seq_printf(m, "eventfd-count: %16llx\n",
-
(unsigned long long)ctx->count);
+ seq_printf(m, "eventfd-count: %16llx\n",
+ (unsigned long long)ctx->count);
spin_unlock_irq(&ctx->wqh.lock);
spin_unlock_irq(&ctx->wqh.lock);
-
- return ret;
}
#endif
}
#endif