[tip: locking/core] cleanup: Specify nonnull argument index
From: tip-bot2 for Dmitry Ilvokhin
Date: Fri Jun 05 2026 - 09:15:16 EST
The following commit has been merged into the locking/core branch of tip:
Commit-ID: a40e0f8eadd44d7b0f856b54c876aea1b93415f4
Gitweb: https://git.kernel.org/tip/a40e0f8eadd44d7b0f856b54c876aea1b93415f4
Author: Dmitry Ilvokhin <d@xxxxxxxxxxxx>
AuthorDate: Fri, 05 Jun 2026 03:06:22 -07:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Fri, 05 Jun 2026 14:46:51 +02:00
cleanup: Specify nonnull argument index
The guard constructors were annotated with an empty __nonnull_args(),
relying on __nonnull__() marking every pointer parameter as non-NULL.
Sparse cannot parse the empty argument list.
Both constructors take the lock pointer as their first parameter, so
specify the index explicitly: __nonnull_args(1).
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Closes: https://lore.kernel.org/all/aiJi0WcYE8FZt-jO@stanley.mountain/
Signed-off-by: Dmitry Ilvokhin <d@xxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://patch.msgid.link/aiKpH3cLBEj3TF2Q@xxxxxxxxxxxxxxxxxx
---
include/linux/cleanup.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
index 6541693..b1b5698 100644
--- a/include/linux/cleanup.h
+++ b/include/linux/cleanup.h
@@ -397,7 +397,7 @@ static __maybe_unused const bool class_##_name##_is_conditional = _is_cond
__DEFINE_GUARD_LOCK_PTR(_name, _T)
#define DEFINE_GUARD(_name, _type, _lock, _unlock) \
- static __always_inline __nonnull_args() _type class_##_name##_constructor(_type _T); \
+ static __always_inline __nonnull_args(1) _type class_##_name##_constructor(_type _T); \
DEFINE_CLASS(_name, _type, _unlock, ({ _lock; _T; }), _type _T); \
DEFINE_CLASS_IS_GUARD(_name)
@@ -498,7 +498,7 @@ static __always_inline void class_##_name##_destructor(class_##_name##_t *_T) \
__DEFINE_GUARD_LOCK_PTR(_name, &_T->lock)
#define __DEFINE_LOCK_GUARD_1(_name, _type, ...) \
-static __always_inline __nonnull_args() \
+static __always_inline __nonnull_args(1) \
class_##_name##_t class_##_name##_constructor(_type *l) \
__no_context_analysis \
{ \