1 files changed, 5 insertions, 4 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index c934689043b2..f50b434756c1 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -212,7 +212,7 @@ struct futex_pi_state {
         atomic_t refcount;
 
         union futex_key key;
-};
+} __randomize_layout;
 
 /**
  * struct futex_q - The hashed futex queue entry, one per waiting task
@@ -246,7 +246,7 @@ struct futex_q {
         struct rt_mutex_waiter *rt_waiter;
         union futex_key *requeue_pi_key;
         u32 bitset;
-};
+} __randomize_layout;
 
 static const struct futex_q futex_q_init = {
         /* list gets initialized in queue_me()*/
@@ -670,13 +670,14 @@ again:
                  * this reference was taken by ihold under the page lock
                  * pinning the inode in place so i_lock was unnecessary. The
                  * only way for this check to fail is if the inode was
-                 * truncated in parallel so warn for now if this happens.
+                 * truncated in parallel which is almost certainly an
+                 * application bug. In such a case, just retry.
                  *
                  * We are not calling into get_futex_key_refs() in file-backed
                  * cases, therefore a successful atomic_inc return below will
                  * guarantee that get_futex_key() will still imply smp_mb(); (B).
                  */
-                if (WARN_ON_ONCE(!atomic_inc_not_zero(&inode->i_count))) {
+                if (!atomic_inc_not_zero(&inode->i_count)) {
                         rcu_read_unlock();
                         put_page(page);