lockref: add a __cond_lock annotation for lockref_put_or_lock

Christoph Hellwig · torvalds · commit 12eef14bcbac · 2025-12-10T05:58:51.000+09:00
Add a cond_lock annotation for lockref_put_or_lock to make sparse
happy with using it.  Note that for this the return value has to be
double-inverted as the return value convention of lockref_put_or_lock
is inverted compared to _trylock conventions expected by __cond_lock,
as lockref_put_or_lock returns true when it did not need to take the
lock.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/linux/lockref.h b/include/linux/lockref.h
@@ -50,6 +50,8 @@ void lockref_get(struct lockref *lockref);
 int lockref_put_return(struct lockref *lockref);
 bool lockref_get_not_zero(struct lockref *lockref);
 bool lockref_put_or_lock(struct lockref *lockref);
+#define lockref_put_or_lock(_lockref) \
+	(!__cond_lock((_lockref)->lock, !lockref_put_or_lock(_lockref)))
 
 void lockref_mark_dead(struct lockref *lockref);
 bool lockref_get_not_dead(struct lockref *lockref);
diff --git a/lib/lockref.c b/lib/lockref.c
@@ -105,6 +105,7 @@ EXPORT_SYMBOL(lockref_put_return);
  * @lockref: pointer to lockref structure
  * Return: 1 if count updated successfully or 0 if count <= 1 and lock taken
  */
+#undef lockref_put_or_lock
 bool lockref_put_or_lock(struct lockref *lockref)
 {
 	CMPXCHG_LOOP(

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ EXPORT_SYMBOL(lockref_put_return);`
`105`	`105`	`* @lockref: pointer to lockref structure`
`106`	`106`	`* Return: 1 if count updated successfully or 0 if count <= 1 and lock taken`
`107`	`107`	`*/`
	`108`	`+#undef lockref_put_or_lock`
`108`	`109`	`bool lockref_put_or_lock(struct lockref *lockref)`
`109`	`110`	`{`
`110`	`111`	`CMPXCHG_LOOP(`