Commit 88299c9b authored Aug 01, 2014 by Dan Carpenter Committed by Thomas Gleixner Aug 27, 2014

timerfd: Remove an always true check



We would have returned -EINVAL earlier if ticks wasn't set.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Link: http://lkml.kernel.org/r/20140801082848.GF28869@mwanda


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 42594970

fs/timerfd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -333,7 +333,6 @@ static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg
		spin_lock_irq(&ctx->wqh.lock);
		if (!timerfd_canceled(ctx)) {
		ctx->ticks = ticks;
		if (ticks)
		wake_up_locked(&ctx->wqh);
		} else
		ret = -ECANCELED;