projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fat: fix using uninitialized fields of fat_inode/fsinfo_inode
[firefly-linux-kernel-4.4.55.git]
/
fs
/
timerfd.c
diff --git
a/fs/timerfd.c
b/fs/timerfd.c
index b94fa6c3c6ebe8c7308aea0052f3afacad9745c4..053818dd6c18be8f228e1c40483e50d78aa78007 100644
(file)
--- a/
fs/timerfd.c
+++ b/
fs/timerfd.c
@@
-153,7
+153,7
@@
static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
if (isalarm(ctx))
remaining = alarm_expires_remaining(&ctx->t.alarm);
else
if (isalarm(ctx))
remaining = alarm_expires_remaining(&ctx->t.alarm);
else
- remaining = hrtimer_expires_remaining(&ctx->t.tmr);
+ remaining = hrtimer_expires_remaining
_adjusted
(&ctx->t.tmr);
return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
}
return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
}