Skip to contentSkip to conversation

locking/rwsem: Remove an unused parameter of rwsem_wake()

PATCH Applied Yehan Xu 3 participants 3 messages Jul 6, 2021 – Jul 27, 2021 Locking primitives

lore
Share & tools
lore

Yehan Xu

author
#0 lore raw

PATCH 1/1 locking/rwsem: Remove an unused parameter of rwsem_wake()

From: xuyehan <[email protected]>

The 2nd parameter 'count' is not used in this function. The places where the function is called are also modified.

---
 kernel/locking/rwsem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/locking/rwsem.c +3 -3
index 16bfbb1..8a595b6 100644
@@ -1165,7 +1165,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
  * handle waking up a waiter on the semaphore
  * - up_read/up_write has decremented the active part of count if we come here
  */
-static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem, long count)
+static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)
 {
 	unsigned long flags;
 	DEFINE_WAKE_Q(wake_q);
@@ -1297,7 +1297,7 @@ static inline void __up_read(struct rw_semaphore *sem)
 	if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS)) ==
 		      RWSEM_FLAG_WAITERS)) {
 		clear_nonspinnable(sem);
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
 	}
 }
 
@@ -1319,7 +1319,7 @@ static inline void __up_write(struct rw_semaphore *sem)
 	rwsem_clear_owner(sem);
 	tmp = atomic_long_fetch_add_release(-RWSEM_WRITER_LOCKED, &sem->count);
 	if (unlikely(tmp & RWSEM_FLAG_WAITERS))
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
 }
 
 /*
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 33 lines · Yehan Xu

From: xuyehan <[email protected]>

The 2nd parameter 'count' is not used in this function. The places where the function is called are also modified.

---
  kernel/locking/rwsem.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
kernel/locking/rwsem.c +2 -2
index 16bfbb1..8a595b6 100644
@@ -1165,7 +1165,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
   * handle waking up a waiter on the semaphore
   * - up_read/up_write has decremented the active part of count if we come here
   */
-static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem, long count)
+static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)
  {
  	unsigned long flags;
  	DEFINE_WAKE_Q(wake_q);
@@ -1297,7 +1297,7 @@ static inline void __up_read(struct rw_semaphore *sem)
  	if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS)) ==
  		      RWSEM_FLAG_WAITERS)) {
  		clear_nonspinnable(sem);
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
  	}
  }
 

kernel/locking/rwsem.c static inline void __up_write(struct rw_semaphore *sem) · line 1325

Quoted 8 lines
kernel/locking/rwsem.c +1 -1
@@ -1319,7 +1319,7 @@ static inline void __up_write(struct rw_semaphore *sem)
  	rwsem_clear_owner(sem);
  	tmp = atomic_long_fetch_add_release(-RWSEM_WRITER_LOCKED, &sem->count);
  	if (unlikely(tmp & RWSEM_FLAG_WAITERS))
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
  }
 
  /*

Right, the count parameter was added in the past for some optimization which had since been taken out. So it is no longer needed.

merge bot Applied
#2 lore raw
In reply to Yehan Xu
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:     d4e5076c3522658996dbb050aa6c708bd2c1a3c1
Gitweb:        https://git.kernel.org/tip/d4e5076c3522658996dbb050aa6c708bd2c1a3c1
Author:        xuyehan <[email protected]>
AuthorDate:    Tue, 06 Jul 2021 12:50:43 +08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Fri, 16 Jul 2021 18:46:44 +02:00

locking/rwsem: Remove an unused parameter of rwsem_wake()

The 2nd parameter 'count' is not used in this function. The places where the function is called are also modified.

---
 kernel/locking/rwsem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/locking/rwsem.c +3 -3
index 809b001..2cad15d 100644
@@ -1165,7 +1165,7 @@ out_nolock:
  * handle waking up a waiter on the semaphore
  * - up_read/up_write has decremented the active part of count if we come here
  */
-static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem, long count)
+static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)
 {
 	unsigned long flags;
 	DEFINE_WAKE_Q(wake_q);
@@ -1297,7 +1297,7 @@ static inline void __up_read(struct rw_semaphore *sem)
 	if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS)) ==
 		      RWSEM_FLAG_WAITERS)) {
 		clear_nonspinnable(sem);
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
 	}
 }
 
@@ -1319,7 +1319,7 @@ static inline void __up_write(struct rw_semaphore *sem)
 	rwsem_clear_owner(sem);
 	tmp = atomic_long_fetch_add_release(-RWSEM_WRITER_LOCKED, &sem->count);
 	if (unlikely(tmp & RWSEM_FLAG_WAITERS))
-		rwsem_wake(sem, tmp);
+		rwsem_wake(sem);
 }
 
 /*