Commit 05b93801 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Thomas Gleixner
Browse files

lockdep: Convert some users to const 



These users of lockdep_is_held() either wanted lockdep_is_held to
take a const pointer, or would benefit from providing a const pointer.

Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Link: https://lkml.kernel.org/r/20180117151414.23686-4-willy@infradead.org
parent 08f36ff6

include/linux/backing-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static inline bool inode_to_wb_is_valid(struct inode *inode) 
 * holding either @inode->i_lock, @inode->i_mapping->tree_lock, or the

 * associated wb's list_lock.

 */

static inline struct bdi_writeback *inode_to_wb(struct inode *inode)

static inline struct bdi_writeback *inode_to_wb(const struct inode *inode)

{

#ifdef CONFIG_LOCKDEP

	WARN_ON_ONCE(debug_locks &&

include/linux/srcu.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void synchronize_srcu(struct srcu_struct *sp); 
 * relies on normal RCU, it can be called from the CPU which

 * is in the idle loop from an RCU point of view or offline.

 */

static inline int srcu_read_lock_held(struct srcu_struct *sp)

static inline int srcu_read_lock_held(const struct srcu_struct *sp)

{

	if (!debug_lockdep_rcu_enabled())

		return 1;
@@ -101,7 +101,7 @@ static inline int srcu_read_lock_held(struct srcu_struct *sp) 


#else /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */



static inline int srcu_read_lock_held(struct srcu_struct *sp)

static inline int srcu_read_lock_held(const struct srcu_struct *sp)

{

	return 1;

}

include/net/sock.h

+1 −3
Original line number Diff line number Diff line
@@ -1445,10 +1445,8 @@ do { \ 
} while (0)



#ifdef CONFIG_LOCKDEP

static inline bool lockdep_sock_is_held(const struct sock *csk)

static inline bool lockdep_sock_is_held(const struct sock *sk)

{

	struct sock *sk = (struct sock *)csk;



	return lockdep_is_held(&sk->sk_lock) ||

	       lockdep_is_held(&sk->sk_lock.slock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE