Skip to contentSkip to conversation

futex: requeue: Remove unnecessary ‘NULL’ values from futex_proxy_trylock_atomic

PATCH Applied Li zeming 2 participants 2 messages Jul 24, 2023 – Oct 4, 2023 Futex

lore
Share & tools
lore

Li zeming

author
#0 lore raw

PATCH 1/1 futex: requeue: Remove unnecessary ‘NULL’ values from futex_proxy_trylock_atomic

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

---
 kernel/futex/requeue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/futex/requeue.c +1 -1
index cba8b1a6a4cc..acf0801c285c 100644
@@ -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;
 
Signature · 1 line
2.18.2
merge bot Applied
#1 lore raw

[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:

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. ]

---
 kernel/futex/requeue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/futex/requeue.c +1 -1
index a0a7995..16a3645 100644
@@ -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;