From: Sha Zhengju Date: Thu, 3 May 2012 05:44:55 +0000 (+1000) Subject: eventfd: change int to __u64 in eventfd_signal() X-Git-Tag: next-20120503~2^2~22 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ac2468870913c9de49ad81d6eb75974bd861869;p=karo-tx-linux.git eventfd: change int to __u64 in eventfd_signal() eventfd_ctx->count is an __u64 counter which is allowed to reach ULLONG_MAX. eventfd_write() adds a __u64 value to "count", but the kernel side eventfd_signal() only adds an int value to it. Make them consistent. Signed-off-by: Sha Zhengju Cc: Davide Libenzi Signed-off-by: Andrew Morton --- diff --git a/fs/eventfd.c b/fs/eventfd.c index dba15fecf23e..f570e7aa06d6 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 91bb4f27238c..3c3ef19a625a 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);