Skip to contentSkip to conversation

timerfd: remove an always true check

PATCH In review Dan Carpenter 3 participants 3 messages Aug 1, 2014 – Aug 27, 2014

Subsystems (3)
VFS Kernel janitors Posix clocks and timers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 timerfd: remove an always true check

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

Signed-off-by Dan Carpenter <[email protected]>
fs/timerfd.c +1 -2
index 80c3502..b46ffa9 100644
@@ -333,8 +333,7 @@ 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);
+			wake_up_locked(&ctx->wqh);
 		} else
 			ret = -ECANCELED;
 		spin_unlock_irq(&ctx->wqh.lock);
merge bot
#2 lore raw

[tip:timers/core] timerfd: Remove an always true check

In reply to Dan Carpenter
timerfd: Remove an always true check
Commit-ID:  88299c9bdb109e0d95abdca648065631ff91b2cb
Gitweb:     http://git.kernel.org/tip/88299c9bdb109e0d95abdca648065631ff91b2cb
Author:     Dan Carpenter <[email protected]>
AuthorDate: Fri, 1 Aug 2014 11:28:48 +0300
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 27 Aug 2014 11:17:48 +0200

timerfd: Remove an always true check

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

Signed-off-by Dan Carpenter <[email protected]>
Cc Alexander Viro <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
Link http://lkml.kernel.org/r/20140801082848.GF28869@mwanda open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 fs/timerfd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/timerfd.c +1 -2
index 80c3502..b46ffa9 100644
@@ -333,8 +333,7 @@ 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);
+			wake_up_locked(&ctx->wqh);
 		} else
 			ret = -ECANCELED;
 		spin_unlock_irq(&ctx->wqh.lock);