From: Christoph Hellwig Date: Tue, 9 Dec 2025 08:18:57 +0000 (+0100) Subject: lockref: add a __cond_lock annotation for lockref_put_or_lock X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12eef14bcbac77bd08dc5693ad5818e69993246f;p=thirdparty%2Flinux.git lockref: add a __cond_lock annotation for lockref_put_or_lock 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 Signed-off-by: Linus Torvalds --- diff --git a/include/linux/lockref.h b/include/linux/lockref.h index 676721ee878d7..815d871fadfcb 100644 --- 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 index 5d8e3ef3860ee..9210fc6ae7149 100644 --- 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(