diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:59:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:59:03 -0400 |
| commit | 638682e9e7beec163f8506b9568046a89d41ce1d (patch) | |
| tree | a4199705a353e2f7b7d1001b2a78f421e4b641a3 | |
| parent | eaa8f757c7eb11dbbf5212713ac5a51384301ab5 (diff) | |
| download | longterm-queue-4.8-638682e9e7beec163f8506b9568046a89d41ce1d.tar.gz | |
timerfd: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/timerfd-Protect-the-might-cancel-mechanism-proper.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/queue/timerfd-Protect-the-might-cancel-mechanism-proper.patch b/queue/timerfd-Protect-the-might-cancel-mechanism-proper.patch index 4dc9def..b3acd3b 100644 --- a/queue/timerfd-Protect-the-might-cancel-mechanism-proper.patch +++ b/queue/timerfd-Protect-the-might-cancel-mechanism-proper.patch @@ -1,4 +1,4 @@ -From 1e38da300e1e395a15048b0af1e5305bd91402f6 Mon Sep 17 00:00:00 2001 +From dc78daea7bcea8b1b2a55d36bd2ba811b9b342a2 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 31 Jan 2017 15:24:03 +0100 Subject: [PATCH] timerfd: Protect the might cancel mechanism proper @@ -26,7 +26,7 @@ Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1701311521430.3457@nanos Signed-off-by: Thomas Gleixner <tglx@linutronix.de> diff --git a/fs/timerfd.c b/fs/timerfd.c -index c173cc196175..384fa759a563 100644 +index 9ae4abb4110b..ab8dd1538381 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -40,6 +40,7 @@ struct timerfd_ctx { @@ -59,7 +59,7 @@ index c173cc196175..384fa759a563 100644 + static bool timerfd_canceled(struct timerfd_ctx *ctx) { - if (!ctx->might_cancel || ctx->moffs != KTIME_MAX) + if (!ctx->might_cancel || ctx->moffs.tv64 != KTIME_MAX) @@ -132,6 +140,7 @@ static bool timerfd_canceled(struct timerfd_ctx *ctx) static void timerfd_setup_cancel(struct timerfd_ctx *ctx, int flags) |