Skip to content

Commit

Permalink
lockref: use bool for false/true returns
Browse files Browse the repository at this point in the history
Replace int used as bool with the actual bool type for return values that
can only be true or false.

Signed-off-by: Christoph Hellwig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Christian Brauner <[email protected]>
  • Loading branch information
Christoph Hellwig authored and brauner committed Jan 16, 2025
1 parent d60f228 commit 6d2868d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
6 changes: 3 additions & 3 deletions include/linux/lockref.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ struct lockref {

extern void lockref_get(struct lockref *);
extern int lockref_put_return(struct lockref *);
extern int lockref_get_not_zero(struct lockref *);
extern int lockref_put_or_lock(struct lockref *);
bool lockref_get_not_zero(struct lockref *lockref);
bool lockref_put_or_lock(struct lockref *lockref);

extern void lockref_mark_dead(struct lockref *);
extern int lockref_get_not_dead(struct lockref *);
bool lockref_get_not_dead(struct lockref *lockref);

/* Must be called under spinlock for reliable results */
static inline bool __lockref_is_dead(const struct lockref *l)
Expand Down
30 changes: 14 additions & 16 deletions lib/lockref.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,22 @@ EXPORT_SYMBOL(lockref_get);
* @lockref: pointer to lockref structure
* Return: 1 if count updated successfully or 0 if count was zero
*/
int lockref_get_not_zero(struct lockref *lockref)
bool lockref_get_not_zero(struct lockref *lockref)
{
int retval;
bool retval = false;

CMPXCHG_LOOP(
new.count++;
if (old.count <= 0)
return 0;
return false;
,
return 1;
return true;
);

spin_lock(&lockref->lock);
retval = 0;
if (lockref->count > 0) {
lockref->count++;
retval = 1;
retval = true;
}
spin_unlock(&lockref->lock);
return retval;
Expand Down Expand Up @@ -106,22 +105,22 @@ EXPORT_SYMBOL(lockref_put_return);
* @lockref: pointer to lockref structure
* Return: 1 if count updated successfully or 0 if count <= 1 and lock taken
*/
int lockref_put_or_lock(struct lockref *lockref)
bool lockref_put_or_lock(struct lockref *lockref)
{
CMPXCHG_LOOP(
new.count--;
if (old.count <= 1)
break;
,
return 1;
return true;
);

spin_lock(&lockref->lock);
if (lockref->count <= 1)
return 0;
return false;
lockref->count--;
spin_unlock(&lockref->lock);
return 1;
return true;
}
EXPORT_SYMBOL(lockref_put_or_lock);

Expand All @@ -141,23 +140,22 @@ EXPORT_SYMBOL(lockref_mark_dead);
* @lockref: pointer to lockref structure
* Return: 1 if count updated successfully or 0 if lockref was dead
*/
int lockref_get_not_dead(struct lockref *lockref)
bool lockref_get_not_dead(struct lockref *lockref)
{
int retval;
bool retval = false;

CMPXCHG_LOOP(
new.count++;
if (old.count < 0)
return 0;
return false;
,
return 1;
return true;
);

spin_lock(&lockref->lock);
retval = 0;
if (lockref->count >= 0) {
lockref->count++;
retval = 1;
retval = true;
}
spin_unlock(&lockref->lock);
return retval;
Expand Down

0 comments on commit 6d2868d

Please sign in to comment.