From mboxrd@z Thu Jan 1 00:00:00 1970 From: Timothy Shimmin Subject: Re: [PATCH] kill walk_init_root Date: Thu, 06 Nov 2008 14:18:35 +1100 Message-ID: <4912620B.5070901@sgi.com> References: <20081105140721.GC5012@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org To: Christoph Hellwig Return-path: Received: from relay2.sgi.com ([192.48.179.30]:45235 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751870AbYKFDSp (ORCPT ); Wed, 5 Nov 2008 22:18:45 -0500 In-Reply-To: <20081105140721.GC5012@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Christoph Hellwig wrote: > walk_init_root is a tiny helper that is marked __always_inline, has just > one caller and an unused argument. Just merge it into the caller. > Looks good. Reviewed-by: Tim Shimmin > > Signed-off-by: Christoph Hellwig > > Index: linux-2.6/fs/namei.c > =================================================================== > --- linux-2.6.orig/fs/namei.c 2008-11-04 12:24:53.000000000 +0100 > +++ linux-2.6/fs/namei.c 2008-11-04 12:26:04.000000000 +0100 > @@ -521,18 +521,6 @@ out_unlock: > return result; > } > > -/* SMP-safe */ > -static __always_inline void > -walk_init_root(const char *name, struct nameidata *nd) > -{ > - struct fs_struct *fs = current->fs; > - > - read_lock(&fs->lock); > - nd->path = fs->root; > - path_get(&fs->root); > - read_unlock(&fs->lock); > -} > - > /* > * Wrapper to retry pathname resolution whenever the underlying > * file system returns an ESTALE. > @@ -570,9 +558,16 @@ static __always_inline int __vfs_follow_ > goto fail; > > if (*link == '/') { > + struct fs_struct *fs = current->fs; > + > path_put(&nd->path); > - walk_init_root(link, nd); > + > + read_lock(&fs->lock); > + nd->path = fs->root; > + path_get(&fs->root); > + read_unlock(&fs->lock); > } > + > res = link_path_walk(link, nd); > if (nd->depth || res || nd->last_type!=LAST_NORM) > return res; > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html