Skip to content

Commit

Permalink
sysfs: use atomic_inc_unless_negative in sysfs_get_active
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Maarten Lankhorst authored and Greg Kroah-Hartman committed Mar 25, 2013
1 parent 9172119 commit 3db3c62
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions fs/sysfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down

0 comments on commit 3db3c62

Please sign in to comment.