From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitri Vorobiev Subject: Re: [PATCH] [2.6.24-rc3-mm1] loop cleanup in fs/namespace.c - repost Date: Thu, 22 Nov 2007 01:49:19 +0300 Message-ID: <4744B5EF.5010708@gmail.com> References: <47447184.6040805@gmail.com> <474481B9.9000603@oracle.com> <47448D0A.1040405@gmail.com> <47449932.3090801@oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080107090803000008020202" Cc: linux-fsdevel@vger.kernel.org, Linux-kernel , Andrew Morton To: Zach Brown Return-path: Received: from nf-out-0910.google.com ([64.233.182.191]:56574 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbXKUWtY (ORCPT ); Wed, 21 Nov 2007 17:49:24 -0500 Received: by nf-out-0910.google.com with SMTP id g13so2270073nfb for ; Wed, 21 Nov 2007 14:49:23 -0800 (PST) In-Reply-To: <47449932.3090801@oracle.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org This is a multi-part message in MIME format. --------------080107090803000008020202 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 8bit Zach Brown пишет: >>> This doesn't look fine. Did you test this? >> Oops, my fault. Of course, I tested the patch, but kernel modules are >> disabled in my test setup, so I missed the error. > > :) > >> Enclosed to this message is a new patch, which replaces the goto-loop by >> the while-based one, but leaves the EXPORT_SYMBOL macro intact. > > It certainly looks OK to me now, for whatever that's worth. Zach, thank you for the code review and suggestions. > > You probably want to wait 'till the next merge window to get it in, > though. It's just a cleanup and so shouldn't go in this late in the -rc > line. > > Maybe Andrew will be willing to queue it until that time in -mm. I am enclosing the patch against current -mm tree and adding Andrew to the Cc: list. Thanks, Dmitri > > - z > --------------080107090803000008020202 Content-Type: text/x-patch; name="loop-cleanup-fs-namespace-mm.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="loop-cleanup-fs-namespace-mm.diff" Signed-off-by: Dmitri Vorobiev --- diff --git a/fs/namespace.c b/fs/namespace.c index 79883fe..b098b63 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -606,19 +606,17 @@ static inline void __mntput(struct vfsmo void mntput_no_expire(struct vfsmount *mnt) { -repeat: - if (atomic_dec_and_lock(&mnt->mnt_count, &vfsmount_lock)) { + while (atomic_dec_and_lock(&mnt->mnt_count, &vfsmount_lock)) { if (likely(!mnt->mnt_pinned)) { spin_unlock(&vfsmount_lock); __mntput(mnt); - return; + break; } atomic_add(mnt->mnt_pinned + 1, &mnt->mnt_count); mnt->mnt_pinned = 0; spin_unlock(&vfsmount_lock); acct_auto_close_mnt(mnt); security_sb_umount_close(mnt); - goto repeat; } } --------------080107090803000008020202--