diff options
author | Eric Biggers <ebiggers@google.com> | 2018-01-06 12:45:44 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-01-06 13:47:20 -0500 |
commit | 105f2b7096075eacb6d2c83a6e00b652c2951063 (patch) | |
tree | dcbaf6f6ad5f44426a295d6e5aebc329e5355440 /fs/eventfd.c | |
parent | b6364572d641c8eba9eab9bcc31d8962f96ddf15 (diff) |
eventfd: fold eventfd_ctx_get() into eventfd_ctx_fileget()
eventfd_ctx_get() is not used outside of eventfd.c, so unexport it and
fold it into eventfd_ctx_fileget().
(eventfd_ctx_get() was apparently added years ago for KVM irqfd's, but
was never used.)
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/eventfd.c')
-rw-r--r-- | fs/eventfd.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/fs/eventfd.c b/fs/eventfd.c index 6138d2b5cdeb..bc0105ae253f 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c | |||
@@ -80,24 +80,11 @@ static void eventfd_free(struct kref *kref) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * eventfd_ctx_get - Acquires a reference to the internal eventfd context. | ||
84 | * @ctx: [in] Pointer to the eventfd context. | ||
85 | * | ||
86 | * Returns: In case of success, returns a pointer to the eventfd context. | ||
87 | */ | ||
88 | struct eventfd_ctx *eventfd_ctx_get(struct eventfd_ctx *ctx) | ||
89 | { | ||
90 | kref_get(&ctx->kref); | ||
91 | return ctx; | ||
92 | } | ||
93 | EXPORT_SYMBOL_GPL(eventfd_ctx_get); | ||
94 | |||
95 | /** | ||
96 | * eventfd_ctx_put - Releases a reference to the internal eventfd context. | 83 | * eventfd_ctx_put - Releases a reference to the internal eventfd context. |
97 | * @ctx: [in] Pointer to eventfd context. | 84 | * @ctx: [in] Pointer to eventfd context. |
98 | * | 85 | * |
99 | * The eventfd context reference must have been previously acquired either | 86 | * The eventfd context reference must have been previously acquired either |
100 | * with eventfd_ctx_get() or eventfd_ctx_fdget(). | 87 | * with eventfd_ctx_fdget() or eventfd_ctx_fileget(). |
101 | */ | 88 | */ |
102 | void eventfd_ctx_put(struct eventfd_ctx *ctx) | 89 | void eventfd_ctx_put(struct eventfd_ctx *ctx) |
103 | { | 90 | { |
@@ -382,10 +369,14 @@ EXPORT_SYMBOL_GPL(eventfd_ctx_fdget); | |||
382 | */ | 369 | */ |
383 | struct eventfd_ctx *eventfd_ctx_fileget(struct file *file) | 370 | struct eventfd_ctx *eventfd_ctx_fileget(struct file *file) |
384 | { | 371 | { |
372 | struct eventfd_ctx *ctx; | ||
373 | |||
385 | if (file->f_op != &eventfd_fops) | 374 | if (file->f_op != &eventfd_fops) |
386 | return ERR_PTR(-EINVAL); | 375 | return ERR_PTR(-EINVAL); |
387 | 376 | ||
388 | return eventfd_ctx_get(file->private_data); | 377 | ctx = file->private_data; |
378 | kref_get(&ctx->kref); | ||
379 | return ctx; | ||
389 | } | 380 | } |
390 | EXPORT_SYMBOL_GPL(eventfd_ctx_fileget); | 381 | EXPORT_SYMBOL_GPL(eventfd_ctx_fileget); |
391 | 382 | ||