UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 98158de..8c4fc14 100644 (file)
--- 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) {
@@ -161,6 +144,7 @@ static const struct file_operations timerfd_fops = {
        .release        = timerfd_release,
        .poll           = timerfd_poll,
        .read           = timerfd_read,
+       .llseek         = noop_llseek,
 };
 
 static struct file *timerfd_fget(int fd)