Messages in this thread Patch in this message | | | From | Sha Zhengju <> | Subject | [PATCH V2] eventfd: change int to __u64 in eventfd_signal() | Date | Tue, 17 Apr 2012 11:44:36 +0800 |
| |
From: Sha Zhengju <handai.szj@taobao.com>
eventfd_ctx->count is an __u64 counter which is allowed to reach ULLONG_MAX. Now eventfd_write() add an __u64 value to "count", but kernel side eventfd_signal() only add an int value to it. So make them consistent.
changelog v2..v1 1. Changing 'n' to an unsigned type makes the "if (n < 0)" test a no-op.
Signed-off-by: Sha Zhengju <handai.szj@taobao.com>
--- fs/eventfd.c | 6 ++---- include/linux/eventfd.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/eventfd.c b/fs/eventfd.c index dba15fe..f570e7a 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -51,15 +51,13 @@ struct eventfd_ctx { * * -EINVAL : The value of @n is negative. */ -int eventfd_signal(struct eventfd_ctx *ctx, int n) +__u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n) { unsigned long flags; - if (n < 0) - return -EINVAL; spin_lock_irqsave(&ctx->wqh.lock, flags); if (ULLONG_MAX - ctx->count < n) - n = (int) (ULLONG_MAX - ctx->count); + n = ULLONG_MAX - ctx->count; ctx->count += n; if (waitqueue_active(&ctx->wqh)) wake_up_locked_poll(&ctx->wqh, POLLIN); diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index 91bb4f2..3c3ef19 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h @@ -34,7 +34,7 @@ void eventfd_ctx_put(struct eventfd_ctx *ctx); struct file *eventfd_fget(int fd); struct eventfd_ctx *eventfd_ctx_fdget(int fd); struct eventfd_ctx *eventfd_ctx_fileget(struct file *file); -int eventfd_signal(struct eventfd_ctx *ctx, int n); +__u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n); ssize_t eventfd_ctx_read(struct eventfd_ctx *ctx, int no_wait, __u64 *cnt); int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_t *wait, __u64 *cnt); -- 1.7.4.1
| |