Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

timerfd: Remove an always true check

Browse Source 
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>
This commit is contained in:
Dan Carpenter 2014-08-01 11:28:48 +03:00 committed by Thomas Gleixner
parent 4259497002
commit 88299c9bdb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/timerfd.c
View File

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