lkml.org 
[lkml]   [2008]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/13] hrtimer: convert timerfd to the new hrtimer apis

    From: Arjan van de Ven <arjan@linux.intel.com>
    Subject: [PATCH] hrtimer: convert timerfd to the new hrtimer apis

    In order to be able to do range hrtimers we need to use accessor functions
    to the "expire" member of the hrtimer struct.
    This patch converts timerfd to these accessors.

    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    ---
    fs/timerfd.c | 8 +++-----
    1 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/fs/timerfd.c b/fs/timerfd.c
    index c502c60..0862f0e 100644
    --- a/fs/timerfd.c
    +++ b/fs/timerfd.c
    @@ -52,11 +52,9 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)

    static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
    {
    - ktime_t now, remaining;
    -
    - now = ctx->tmr.base->get_time();
    - remaining = ktime_sub(ctx->tmr.expires, now);
    + ktime_t remaining;

    + remaining = hrtimer_expires_remaining(&ctx->tmr);
    return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
    }

    @@ -74,7 +72,7 @@ static void timerfd_setup(struct timerfd_ctx *ctx, int flags,
    ctx->ticks = 0;
    ctx->tintv = timespec_to_ktime(ktmr->it_interval);
    hrtimer_init(&ctx->tmr, ctx->clockid, htmode);
    - ctx->tmr.expires = texp;
    + hrtimer_set_expires(&ctx->tmr, texp);
    ctx->tmr.function = timerfd_tmrproc;
    if (texp.tv64 != 0)
    hrtimer_start(&ctx->tmr, texp, htmode);
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-09-02 01:19    [W:0.020 / U:91.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site