Re: [PATCH 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq()

Davide Libenzi
2010-04-16T16:10:28Z

On Fri, 16 Apr 2010, Michal Nazarewicz wrote:

> This patch modifies the fs/timerfd.c to use the newly created
> wait_event_interruptible_locked_irq() macro. This replaces an open
> code implementation with a single macro call.
>
> Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> fs/timerfd.c | 25 ++++---------------------
> 1 files changed, 4 insertions(+), 21 deletions(-)
>
> diff --git a/fs/timerfd.c b/fs/timerfd.c
> index 98158de..b86ab8e 100644
> --- a/fs/timerfd.c
> +++ b/fs/timerfd.c
> @@ -110,31 +110,14 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
> struct timerfd_ctx *ctx = file->private_data;
> ssize_t res;
> u64 ticks = 0;
> - DECLARE_WAITQUEUE(wait, current);
>
> if (count < sizeof(ticks))
> return -EINVAL;
> spin_lock_irq(&ctx->wqh.lock);
> - res = -EAGAIN;
> - if (!ctx->ticks && !(file->f_flags & O_NONBLOCK)) {
> - __add_wait_queue(&ctx->wqh, &wait);
> - for (res = 0;;) {
> - set_current_state(TASK_INTERRUPTIBLE);
> - if (ctx->ticks) {
> - res = 0;
> - break;
> - }
> - if (signal_pending(current)) {
> - res = -ERESTARTSYS;
> - break;
> - }
> - spin_unlock_irq(&ctx->wqh.lock);
> - schedule();
> - spin_lock_irq(&ctx->wqh.lock);
> - }
> - __remove_wait_queue(&ctx->wqh, &wait);
> - __set_current_state(TASK_RUNNING);
> - }
> + if (file->f_flags & O_NONBLOCK)
> + res = -EAGAIN;
> + else
> + res = wait_event_interruptible_locked_irq(ctx->wqh, ctx->ticks);
> if (ctx->ticks) {
> ticks = ctx->ticks;
> if (ctx->expired && ctx->tintv.tv64) {

Looks clean to me.

Acked-By: Davide Libenzi <davidel@xmailserver.org>

- Davide