Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932658Ab3CSANE (ORCPT ); Mon, 18 Mar 2013 20:13:04 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:49818 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932615Ab3CSANC (ORCPT ); Mon, 18 Mar 2013 20:13:02 -0400 Date: Mon, 18 Mar 2013 17:14:18 -0700 From: Greg KH To: Maarten Lankhorst , tj@kernel.org Cc: LKML Subject: Re: [PATCH] sysfs: use atomic_inc_unless_negative in sysfs_get_active Message-ID: <20130319001418.GA13502@kroah.com> References: <5139FEAF.5080200@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5139FEAF.5080200@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1441 Lines: 49 On Fri, Mar 08, 2013 at 04:07:27PM +0100, Maarten Lankhorst wrote: > 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 > --- Tejun wrote this code originally, so I'll defer to him as to if the patch below is a valid cleanup or not. Tejun? > > diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c > index 2fbdff6..7f968ed 100644 > --- a/fs/sysfs/dir.c > +++ b/fs/sysfs/dir.c > @@ -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_); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/