Commit 6106864b authored by Alice Ryhl's avatar Alice Ryhl Committed by Andrew Morton
Browse files

maple_tree: remove lockdep_map_p typedef 

Having the ma_external_lock field exist when CONFIG_LOCKDEP=n isn't used
anywhere, so just get rid of it.  This also avoids generating a typedef
called lockdep_map_p that could overlap with typedefs in other header
files.

Link: https://lkml.kernel.org/r/20250902-maple-lockdep-p-v1-1-3ae5a398a379@google.com


Signed-off-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 152d4258

include/linux/maple_tree.h

+4 −4
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ enum store_type { 
#define MAPLE_RESERVED_RANGE	4096



#ifdef CONFIG_LOCKDEP

typedef struct lockdep_map *lockdep_map_p;

#define mt_lock_is_held(mt)                                             \

	(!(mt)->ma_external_lock || lock_is_held((mt)->ma_external_lock))
@@ -207,7 +206,6 @@ typedef struct lockdep_map *lockdep_map_p; 


#define mt_on_stack(mt)			(mt).ma_external_lock = NULL

#else

typedef struct { /* nothing */ } lockdep_map_p;

#define mt_lock_is_held(mt)		1

#define mt_write_lock_is_held(mt)	1

#define mt_set_external_lock(mt, lock)	do { } while (0)
@@ -231,7 +229,9 @@ typedef struct { /* nothing */ } lockdep_map_p; 
struct maple_tree {

	union {

		spinlock_t		ma_lock;

		lockdep_map_p	ma_external_lock;

#ifdef CONFIG_LOCKDEP

		struct lockdep_map	*ma_external_lock;

#endif

	};

	unsigned int	ma_flags;

	void __rcu      *ma_root;