hrtimer: convert timerfd to the new hrtimer apis (76369470) · Commits · 戴 / test

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -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);

Admin message