2023-07-24 03:43:22

by Li zeming

[permalink] [raw]
Subject: [PATCH] futex: requeue: Remove unnecessary ‘NULL’ values from futex_proxy_tryloc k_atomic

top_waiter is assigned first, so it does not need to initialize the
assignment.

Signed-off-by: Li zeming <[email protected]>
---
kernel/futex/requeue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c
index cba8b1a6a4cc..acf0801c285c 100644
--- a/kernel/futex/requeue.c
+++ b/kernel/futex/requeue.c
@@ -269,7 +269,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
union futex_key *key2, struct futex_pi_state **ps,
struct task_struct **exiting, int set_waiters)
{
- struct futex_q *top_waiter = NULL;
+ struct futex_q *top_waiter;
u32 curval;
int ret;

--
2.18.2



Subject: [tip: locking/core] futex/requeue: Remove unnecessary ‘NULL’ initialization from futex_proxy_trylock_atomic()

The following commit has been merged into the locking/core branch of tip:

Commit-ID: 01a99a750a4f414c221781de2e5570e0ceae04b5
Gitweb: https://git.kernel.org/tip/01a99a750a4f414c221781de2e5570e0ceae04b5
Author: Li zeming <[email protected]>
AuthorDate: Wed, 26 Jul 2023 03:50:47 +08:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Wed, 04 Oct 2023 18:04:47 +02:00

futex/requeue: Remove unnecessary ‘NULL’ initialization from futex_proxy_trylock_atomic()

'top_waiter' is assigned unconditionally before first use,
so it does not need an initialization.

[ mingo: Created legible changelog. ]

Signed-off-by: Li zeming <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
kernel/futex/requeue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c
index a0a7995..16a3645 100644
--- a/kernel/futex/requeue.c
+++ b/kernel/futex/requeue.c
@@ -269,7 +269,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
union futex_key *key2, struct futex_pi_state **ps,
struct task_struct **exiting, int set_waiters)
{
- struct futex_q *top_waiter = NULL;
+ struct futex_q *top_waiter;
u32 curval;
int ret;