sysfs: use atomic_inc_unless_negative in sysfs_get_active
PATCH 1/1 sysfs: use atomic_inc_unless_negative in sysfs_get_active
It seems that sysfs has an interesting way of doing the same thing. This removes the cpu_relax unfortunately, but if it's really needed, it would be better to add this to include/linux/atomic.h to benefit all atomic ops users.
---
fs/sysfs/dir.c +2 -15
@@ -165,21 +165,8 @@ struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd)if (unlikely (!sd))return NULL ; -while (1 ) { -int v, t; - - v =atomic_read (&sd->s_active); -if (unlikely (v <0 )) -return NULL ; - - t =atomic_cmpxchg (&sd->s_active, v, v +1 ); -if (likely (t == v)) -break ; -if (t <0 ) -return NULL ; - -cpu_relax (); - } +if (!atomic_inc_unless_negative (&sd->s_active)) +return NULL ;if (likely (!ignore_lockdep (sd)))rwsem_acquire_read (&sd->dep_map,0 ,1 , _RET_IP_);
Greg KH
maintainerQuoted 7 lines · Maarten Lankhorst
It seems that sysfs has an interesting way of doing the same thing. This removes the
cpu_relaxunfortunately, but if it's really needed, it would be better to add this toinclude/linux/atomic.hto benefit all atomic ops users.Signed-off-by Maarten Lankhorst <[email protected]>---
Tejun wrote this code originally, so I'll defer to him as to if the patch below is a valid cleanup or not.
Tejun?
Quoted 29 lines
fs/sysfs/dir.c +2
-15@@ -165,21 +165,8 @@ struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd)if (unlikely (!sd))return NULL ; -while (1 ) { -int v, t; - - v =atomic_read (&sd->s_active); -if (unlikely (v <0 )) -return NULL ; - - t =atomic_cmpxchg (&sd->s_active, v, v +1 ); -if (likely (t == v)) -break ; -if (t <0 ) -return NULL ; - -cpu_relax (); - } +if (!atomic_inc_unless_negative (&sd->s_active)) +return NULL ;if (likely (!ignore_lockdep (sd)))rwsem_acquire_read (&sd->dep_map,0 ,1 , _RET_IP_);
Tejun Heo
Acked-byQuoted 11 lines · Greg KH
Quoted 7 lines · Maarten Lankhorst
It seems that sysfs has an interesting way of doing the same thing. This removes the
cpu_relaxunfortunately, but if it's really needed, it would be better to add this toinclude/linux/atomic.hto benefit all atomic ops users.Signed-off-by Maarten Lankhorst <[email protected]>---
Tejun wrote this code originally, so I'll defer to him as to if the patch below is a valid cleanup or not.
Yeah, I think that code predates atomic_inc_unless_negative().
Quoted 17 lines
Quoted 17 lines
fs/sysfs/dir.c +0
-9@@ -165,21 +165,8 @@ struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd)if (unlikely (!sd))return NULL ; -while (1 ) { -int v, t; - - v =atomic_read (&sd->s_active); -if (unlikely (v <0 )) -return NULL ; - - t =atomic_cmpxchg (&sd->s_active, v, v +1 ); -if (likely (t == v))
Quoted 8 lines
fs/sysfs/dir.c struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd) · line 169
Quoted 8 lines
fs/sysfs/dir.c +2
-6-break ; -if (t <0 ) -return NULL ; - -cpu_relax (); - } +if (!atomic_inc_unless_negative (&sd->s_active)) +return NULL ;
Looks good to me.
Thanks.
Signature · 1 line
tejun